vbox: remove calls to *InstallUniformedAPI macros.

That is, for versions older than 4.0. Also do not try to include
headers for those old versions.

diff --git a/src/vbox/vbox_common.h b/src/vbox/vbox_common.h
index e29a7bde0fcc5207be716170787559792388fd04..7bbab8d01172856bfc506742cff4cba1318e4d07 100644 (file)
--- a/src/vbox/vbox_common.h
+++ b/src/vbox/vbox_common.h
@@ -410,15 +410,7 @@ typedef nsISupports IKeyboard;
 # define installUniformedAPI(gVBoxAPI, result)                          \
     do {                                                                \
         result = 0;                                                     \
-        if (uVersion >= 2001052 && uVersion < 2002051) {                \
-            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) {         \
+        if (uVersion >= 3002051 && uVersion < 4000051) {         \
             vbox40InstallUniformedAPI(&gVBoxAPI);                       \
         } else if (uVersion >= 4000051 && uVersion < 4001051) {         \
             vbox41InstallUniformedAPI(&gVBoxAPI);                       \

diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c
index 27d38ad37aa9dc121c2a2cc2dc83177fce1c7a02..c2867531acd75ad15ce27a76efb1b1420b81a45e 100644 (file)
--- a/src/vbox/vbox_storage.c
+++ b/src/vbox/vbox_storage.c
@@ -888,15 +888,7 @@ virStorageDriverPtr vboxGetStorageDriver(uint32_t uVersion)
     /* Install gVBoxAPI according to the vbox API version.
      * Return -1 for unsupported version.
      */
-    if (uVersion >= 2001052 && uVersion < 2002051) {
-        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) {
+    if (uVersion >= 3002051 && uVersion < 4000051) {
         vbox40InstallUniformedAPI(&gVBoxAPI);
     } else if (uVersion >= 4000051 && uVersion < 4001051) {
         vbox41InstallUniformedAPI(&gVBoxAPI);

diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h
index 6a8b6bc96591197986d130281798e2402cb2bc49..3b2b7a800eeb4d12ecbebe5129029951f93ff7ab 100644 (file)
--- a/src/vbox/vbox_uniformed_api.h
+++ b/src/vbox/vbox_uniformed_api.h
@@ -616,10 +616,6 @@ virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn,
                                     const unsigned char *uuid);
 
 /* 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 vbox41InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
 void vbox42InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);