vbox: remove support for version 5.1 API

This is no longer supported since 2018/04

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am
index c05fa7a7b95f44cbd9aa7fdcb8834e0460b6b521..3b4c6b8f989fbfb15f4c054d71525e0722369aad 100644 (file)
--- 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_1.c \
-       vbox/vbox_CAPI_v5_1.h \
        vbox/vbox_V5_2.c \
        vbox/vbox_CAPI_v5_2.h \
        vbox/vbox_common.c \

diff --git a/src/vbox/vbox_V5_1.c b/src/vbox/vbox_V5_1.c
deleted file mode 100644 (file)
index 839bced..0000000
--- a/src/vbox/vbox_V5_1.c
+++ /dev/null
@@ -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"

diff --git a/src/vbox/vbox_XPCOMCGlue.h b/src/vbox/vbox_XPCOMCGlue.h
index 0f3fc4151286da10c8293d5558807040e5b673ec..517b02393f9defe1f13c5f3757a5711f9ae57830 100644 (file)
--- 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_1.h"
+# include "vbox_CAPI_v5_2.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 0a699e32778beccf7dde232de8b1da81f61aa522..9ea984276ddb722e90d1e98bc1bc745964d335bb 100644 (file)
--- 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 >= 5000051 && uVersion < 5001051) { \
-            vbox51InstallUniformedAPI(&gVBoxAPI); \
-        } else if (uVersion >= 5001051 && uVersion < 5002051) { \
+        if (uVersion >= 5001051 && uVersion < 5002051) { \
             vbox52InstallUniformedAPI(&gVBoxAPI); \
         } else { \
             result = -1; \

diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c
index 730c8c5a05156dc07ff4c825625786c8f2555d8b..e0b82f4bd8bf4e975317f9e32c895ca9fea56cc1 100644 (file)
--- 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 >= 5000051 && uVersion < 5001051) {
-        vbox51InstallUniformedAPI(&gVBoxAPI);
-    } else if (uVersion >= 5001051 && uVersion < 5002051) {
+    if (uVersion >= 5001051 && uVersion < 5002051) {
         vbox52InstallUniformedAPI(&gVBoxAPI);
     } else {
         return NULL;

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 1ceb8b487a8f9120a00009efa316a616e0d79881..94fdf211d91feac32c1ce0ef52159c215cea4263 100644 (file)
--- 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 == 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"

diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h
index 2a592e0cb4d8af6c2b3c385ca1a227f9039f8e45..8e2f21743964612b7970e55a8140c8abd298866c 100644 (file)
--- a/src/vbox/vbox_uniformed_api.h
+++ b/src/vbox/vbox_uniformed_api.h
@@ -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);