This is no longer supported since 2017/05 Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx> --- src/vbox/Makefile.inc.am | 2 -- src/vbox/vbox_V5_0.c | 13 ------------- src/vbox/vbox_XPCOMCGlue.h | 2 +- src/vbox/vbox_common.h | 4 +--- src/vbox/vbox_storage.c | 4 +--- src/vbox/vbox_tmpl.c | 4 +--- src/vbox/vbox_uniformed_api.h | 1 - 7 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 src/vbox/vbox_V5_0.c diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 8d2467f39e..c05fa7a7b9 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -7,8 +7,6 @@ VBOX_DRIVER_SOURCES = \ vbox/vbox_driver.h \ vbox/vbox_snapshot_conf.c \ vbox/vbox_snapshot_conf.h \ - vbox/vbox_V5_0.c \ - vbox/vbox_CAPI_v5_0.h \ vbox/vbox_V5_1.c \ vbox/vbox_CAPI_v5_1.h \ vbox/vbox_V5_2.c \ diff --git a/src/vbox/vbox_V5_0.c b/src/vbox/vbox_V5_0.c deleted file mode 100644 index 4293944724..0000000000 --- a/src/vbox/vbox_V5_0.c +++ /dev/null @@ -1,13 +0,0 @@ -/** @file vbox_V5_0.c - * C file to include support for multiple versions of VirtualBox - * at runtime. - */ - -#include <config.h> - -/** The API Version */ -#define VBOX_API_VERSION 5000000 -/** Version specific prefix. */ -#define NAME(name) vbox50##name - -#include "vbox_tmpl.c" diff --git a/src/vbox/vbox_XPCOMCGlue.h b/src/vbox/vbox_XPCOMCGlue.h index df4c94cbbf..0f3fc41512 100644 --- a/src/vbox/vbox_XPCOMCGlue.h +++ b/src/vbox/vbox_XPCOMCGlue.h @@ -30,7 +30,7 @@ # define ___VBoxXPCOMC_cglue_h /* This has to be the oldest version we support. */ -# include "vbox_CAPI_v5_0.h" +# include "vbox_CAPI_v5_1.h" /** Pointer to VBoxGetXPCOMCFunctions for the loaded VBoxXPCOMC so/dylib/dll. */ extern PFNVBOXGETXPCOMCFUNCTIONS g_pfnGetFunctions; diff --git a/src/vbox/vbox_common.h b/src/vbox/vbox_common.h index f3294334d8..0a699e3277 100644 --- a/src/vbox/vbox_common.h +++ b/src/vbox/vbox_common.h @@ -429,9 +429,7 @@ typedef nsISupports IKeyboard; #define installUniformedAPI(gVBoxAPI, result) \ do { \ result = 0; \ - if (uVersion >= 5000000 && uVersion < 5000051) { \ - vbox50InstallUniformedAPI(&gVBoxAPI); \ - } else if (uVersion >= 5000051 && uVersion < 5001051) { \ + if (uVersion >= 5000051 && uVersion < 5001051) { \ vbox51InstallUniformedAPI(&gVBoxAPI); \ } else if (uVersion >= 5001051 && uVersion < 5002051) { \ vbox52InstallUniformedAPI(&gVBoxAPI); \ diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index b9dcacc62e..730c8c5a05 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -880,9 +880,7 @@ virStorageDriverPtr vboxGetStorageDriver(uint32_t uVersion) /* Install gVBoxAPI according to the vbox API version. * Return -1 for unsupported version. */ - if (uVersion >= 5000000 && uVersion < 5000051) { - vbox50InstallUniformedAPI(&gVBoxAPI); - } else if (uVersion >= 5000051 && uVersion < 5001051) { + if (uVersion >= 5000051 && uVersion < 5001051) { vbox51InstallUniformedAPI(&gVBoxAPI); } else if (uVersion >= 5001051 && uVersion < 5002051) { vbox52InstallUniformedAPI(&gVBoxAPI); diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index a2d3db4307..1ceb8b487a 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -49,9 +49,7 @@ #include "virutil.h" /* This one changes from version to version. */ -#if VBOX_API_VERSION == 5000000 -# include "vbox_CAPI_v5_0.h" -#elif VBOX_API_VERSION == 5001000 +#if VBOX_API_VERSION == 5001000 # include "vbox_CAPI_v5_1.h" #elif VBOX_API_VERSION == 5002000 # include "vbox_CAPI_v5_2.h" diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h index ca307e30b1..2a592e0cb4 100644 --- a/src/vbox/vbox_uniformed_api.h +++ b/src/vbox/vbox_uniformed_api.h @@ -555,6 +555,5 @@ virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid); /* Version specified functions for installing uniformed API */ -void vbox50InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox51InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox52InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); -- 2.25.2