External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

vbox: remove support for version 5.1 API

Browse Source 
This is no longer supported since 2018/04

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-04-17 12:03:50 +01:00
parent fb750a17fb
commit e91a6d8e22
7 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vbox/Makefile.inc.am
View File

@ -7,8 +7,6 @@ VBOX_DRIVER_SOURCES = \
vbox/vbox_driver.h \
vbox/vbox_snapshot_conf.c \
vbox/vbox_snapshot_conf.h \
vbox/vbox_V5_1.c \
vbox/vbox_CAPI_v5_1.h \
vbox/vbox_V5_2.c \
vbox/vbox_CAPI_v5_2.h \
vbox/vbox_common.c \

13
src/vbox/vbox_V5_1.c
View File

@ -1,13 +0,0 @@
/** @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"

2
src/vbox/vbox_XPCOMCGlue.h
View File

@ -30,7 +30,7 @@
# define ___VBoxXPCOMC_cglue_h
/* 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. */
extern PFNVBOXGETXPCOMCFUNCTIONS g_pfnGetFunctions;

4
src/vbox/vbox_common.h
View File

@ -429,9 +429,7 @@ typedef nsISupports IKeyboard;
#define installUniformedAPI(gVBoxAPI, result) \
do { \
result = 0; \
if (uVersion >= 5000051 && uVersion < 5001051) { \
vbox51InstallUniformedAPI(&gVBoxAPI); \
} else if (uVersion >= 5001051 && uVersion < 5002051) { \
if (uVersion >= 5001051 && uVersion < 5002051) { \
vbox52InstallUniformedAPI(&gVBoxAPI); \
} else { \
result = -1; \

4
src/vbox/vbox_storage.c
View File

@ -880,9 +880,7 @@ virStorageDriverPtr vboxGetStorageDriver(uint32_t uVersion)
/* Install gVBoxAPI according to the vbox API version.
* Return -1 for unsupported version.
*/
if (uVersion >= 5000051 && uVersion < 5001051) {
vbox51InstallUniformedAPI(&gVBoxAPI);
} else if (uVersion >= 5001051 && uVersion < 5002051) {
if (uVersion >= 5001051 && uVersion < 5002051) {
vbox52InstallUniformedAPI(&gVBoxAPI);
} else {
return NULL;

4
src/vbox/vbox_tmpl.c
View File

@ -49,9 +49,7 @@
#include "virutil.h"
/* This one changes from version to version. */
#if VBOX_API_VERSION == 5001000
# include "vbox_CAPI_v5_1.h"
#elif VBOX_API_VERSION == 5002000
#if VBOX_API_VERSION == 5002000
# include "vbox_CAPI_v5_2.h"
#else
# error "Unsupport VBOX_API_VERSION"

1
src/vbox/vbox_uniformed_api.h
View File

@ -555,5 +555,4 @@ virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn,
const unsigned char *uuid);
/* Version specified functions for installing uniformed API */
void vbox51InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
void vbox52InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);