提交 e91a6d8e 编写于 作者: D Daniel P. Berrangé

vbox: remove support for version 5.1 API

This is no longer supported since 2018/04
Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 fb750a17
...@@ -7,8 +7,6 @@ VBOX_DRIVER_SOURCES = \ ...@@ -7,8 +7,6 @@ VBOX_DRIVER_SOURCES = \
vbox/vbox_driver.h \ vbox/vbox_driver.h \
vbox/vbox_snapshot_conf.c \ vbox/vbox_snapshot_conf.c \
vbox/vbox_snapshot_conf.h \ vbox/vbox_snapshot_conf.h \
vbox/vbox_V5_1.c \
vbox/vbox_CAPI_v5_1.h \
vbox/vbox_V5_2.c \ vbox/vbox_V5_2.c \
vbox/vbox_CAPI_v5_2.h \ vbox/vbox_CAPI_v5_2.h \
vbox/vbox_common.c \ vbox/vbox_common.c \
......
/** @file vbox_V5_1.c
* C file to include support for multiple versions of VirtualBox
* at runtime.
*/
#include <config.h>
/** The API Version */
#define VBOX_API_VERSION 5001000
/** Version specific prefix. */
#define NAME(name) vbox51##name
#include "vbox_tmpl.c"
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
# define ___VBoxXPCOMC_cglue_h # define ___VBoxXPCOMC_cglue_h
/* This has to be the oldest version we support. */ /* This has to be the oldest version we support. */
# include "vbox_CAPI_v5_1.h" # include "vbox_CAPI_v5_2.h"
/** Pointer to VBoxGetXPCOMCFunctions for the loaded VBoxXPCOMC so/dylib/dll. */ /** Pointer to VBoxGetXPCOMCFunctions for the loaded VBoxXPCOMC so/dylib/dll. */
extern PFNVBOXGETXPCOMCFUNCTIONS g_pfnGetFunctions; extern PFNVBOXGETXPCOMCFUNCTIONS g_pfnGetFunctions;
......
...@@ -429,9 +429,7 @@ typedef nsISupports IKeyboard; ...@@ -429,9 +429,7 @@ typedef nsISupports IKeyboard;
#define installUniformedAPI(gVBoxAPI, result) \ #define installUniformedAPI(gVBoxAPI, result) \
do { \ do { \
result = 0; \ result = 0; \
if (uVersion >= 5000051 && uVersion < 5001051) { \ if (uVersion >= 5001051 && uVersion < 5002051) { \
vbox51InstallUniformedAPI(&gVBoxAPI); \
} else if (uVersion >= 5001051 && uVersion < 5002051) { \
vbox52InstallUniformedAPI(&gVBoxAPI); \ vbox52InstallUniformedAPI(&gVBoxAPI); \
} else { \ } else { \
result = -1; \ result = -1; \
......
...@@ -880,9 +880,7 @@ virStorageDriverPtr vboxGetStorageDriver(uint32_t uVersion) ...@@ -880,9 +880,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 >= 5000051 && uVersion < 5001051) { if (uVersion >= 5001051 && uVersion < 5002051) {
vbox51InstallUniformedAPI(&gVBoxAPI);
} else if (uVersion >= 5001051 && uVersion < 5002051) {
vbox52InstallUniformedAPI(&gVBoxAPI); vbox52InstallUniformedAPI(&gVBoxAPI);
} else { } else {
return NULL; return NULL;
......
...@@ -49,9 +49,7 @@ ...@@ -49,9 +49,7 @@
#include "virutil.h" #include "virutil.h"
/* This one changes from version to version. */ /* This one changes from version to version. */
#if VBOX_API_VERSION == 5001000 #if VBOX_API_VERSION == 5002000
# include "vbox_CAPI_v5_1.h"
#elif VBOX_API_VERSION == 5002000
# include "vbox_CAPI_v5_2.h" # include "vbox_CAPI_v5_2.h"
#else #else
# error "Unsupport VBOX_API_VERSION" # error "Unsupport VBOX_API_VERSION"
......
...@@ -555,5 +555,4 @@ virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn, ...@@ -555,5 +555,4 @@ 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 vbox51InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
void vbox52InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox52InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册