NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

vbox: remove calls to *InstallUniformedAPI macros.

Browse Source 
That is, for versions older than 4.0. Also do not try to include
headers for those old versions.
This commit is contained in:
Dawid Zamirski 2016-12-29 15:34:23 -05:00 committed by John Ferlan
parent 7f10ac33e9
commit 655a99f166
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vbox/vbox_common.h
View File

@ -410,15 +410,7 @@ typedef nsISupports IKeyboard;
# define installUniformedAPI(gVBoxAPI, result) \ # define installUniformedAPI(gVBoxAPI, result) \
do { \ do { \
result = 0; \ result = 0; \
if (uVersion >= 2001052 && uVersion < 2002051) { \ if (uVersion >= 3002051 && uVersion < 4000051) { \
vbox22InstallUniformedAPI(&gVBoxAPI); \
} else if (uVersion >= 2002051 && uVersion < 3000051) { \
vbox30InstallUniformedAPI(&gVBoxAPI); \
} else if (uVersion >= 3000051 && uVersion < 3001051) { \
vbox31InstallUniformedAPI(&gVBoxAPI); \
} else if (uVersion >= 3001051 && uVersion < 3002051) { \
vbox32InstallUniformedAPI(&gVBoxAPI); \
} else if (uVersion >= 3002051 && uVersion < 4000051) { \
vbox40InstallUniformedAPI(&gVBoxAPI); \ vbox40InstallUniformedAPI(&gVBoxAPI); \
} else if (uVersion >= 4000051 && uVersion < 4001051) { \ } else if (uVersion >= 4000051 && uVersion < 4001051) { \
vbox41InstallUniformedAPI(&gVBoxAPI); \ vbox41InstallUniformedAPI(&gVBoxAPI); \

10
src/vbox/vbox_storage.c
View File

@ -888,15 +888,7 @@ virStorageDriverPtr vboxGetStorageDriver(uint32_t uVersion)
/* Install gVBoxAPI according to the vbox API version. /* Install gVBoxAPI according to the vbox API version.
* Return -1 for unsupported version. * Return -1 for unsupported version.
*/ */
if (uVersion >= 2001052 && uVersion < 2002051) { if (uVersion >= 3002051 && uVersion < 4000051) {
vbox22InstallUniformedAPI(&gVBoxAPI);
} else if (uVersion >= 2002051 && uVersion < 3000051) {
vbox30InstallUniformedAPI(&gVBoxAPI);
} else if (uVersion >= 3000051 && uVersion < 3001051) {
vbox31InstallUniformedAPI(&gVBoxAPI);
} else if (uVersion >= 3001051 && uVersion < 3002051) {
vbox32InstallUniformedAPI(&gVBoxAPI);
} else if (uVersion >= 3002051 && uVersion < 4000051) {
vbox40InstallUniformedAPI(&gVBoxAPI); vbox40InstallUniformedAPI(&gVBoxAPI);
} else if (uVersion >= 4000051 && uVersion < 4001051) { } else if (uVersion >= 4000051 && uVersion < 4001051) {
vbox41InstallUniformedAPI(&gVBoxAPI); vbox41InstallUniformedAPI(&gVBoxAPI);

4
src/vbox/vbox_uniformed_api.h
View File

@ -616,10 +616,6 @@ virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn,
const unsigned char *uuid); const unsigned char *uuid);
/* Version specified functions for installing uniformed API */ /* Version specified functions for installing uniformed API */
void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
void vbox30InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
void vbox31InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
void vbox32InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
void vbox40InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox40InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
void vbox41InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox41InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
void vbox42InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox42InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);