From 4fd719424841cf0f3d811bc8c79ebd588d894f21 Mon Sep 17 00:00:00 2001 From: Dawid Zamirski Date: Tue, 8 Nov 2016 09:56:33 +0000 Subject: [PATCH] vbox: hookup the 5.1 C API to the unified driver --- src/Makefile.am | 1 + src/vbox/vbox_common.h | 2 ++ src/vbox/vbox_storage.c | 2 ++ src/vbox/vbox_tmpl.c | 2 ++ src/vbox/vbox_uniformed_api.h | 1 + 5 files changed, 8 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 8ee5567b78..d417b6eb41 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -800,6 +800,7 @@ VBOX_DRIVER_SOURCES = \ vbox/vbox_V4_3.c vbox/vbox_CAPI_v4_3.h \ vbox/vbox_V4_3_4.c vbox/vbox_CAPI_v4_3_4.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_common.c vbox/vbox_common.h \ vbox/vbox_uniformed_api.h \ vbox/vbox_get_driver.h \ diff --git a/src/vbox/vbox_common.h b/src/vbox/vbox_common.h index b178878af1..f68bf1b113 100644 --- a/src/vbox/vbox_common.h +++ b/src/vbox/vbox_common.h @@ -432,6 +432,8 @@ typedef nsISupports IKeyboard; vbox43_4InstallUniformedAPI(&gVBoxAPI); \ } else if (uVersion >= 4003051 && uVersion < 5000051) { \ vbox50InstallUniformedAPI(&gVBoxAPI); \ + } else if (uVersion >= 5000051 && uVersion < 5001051) { \ + vbox51InstallUniformedAPI(&gVBoxAPI); \ } else { \ result = -1; \ } \ diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index c849505931..743c5d362b 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -910,6 +910,8 @@ virStorageDriverPtr vboxGetStorageDriver(uint32_t uVersion) vbox43_4InstallUniformedAPI(&gVBoxAPI); } else if (uVersion >= 4003051 && uVersion < 5000051) { vbox50InstallUniformedAPI(&gVBoxAPI); + } else if (uVersion >= 5000051 && uVersion < 5001051) { + vbox51InstallUniformedAPI(&gVBoxAPI); } else { return NULL; } diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 23f63f9748..6892cc7730 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -71,6 +71,8 @@ # include "vbox_CAPI_v4_3_4.h" #elif VBOX_API_VERSION == 5000000 # include "vbox_CAPI_v5_0.h" +#elif VBOX_API_VERSION == 5001000 +# include "vbox_CAPI_v5_1.h" #else # error "Unsupport VBOX_API_VERSION" #endif diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h index 74e9ac051c..8ec1533a8b 100644 --- a/src/vbox/vbox_uniformed_api.h +++ b/src/vbox/vbox_uniformed_api.h @@ -629,5 +629,6 @@ void vbox42_20InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox43InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox43_4InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox50InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); +void vbox51InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); #endif /* VBOX_UNIFORMED_API_H */