vbox: Rewrite vboxConnectGetVersion

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 28d8668302e10ffe8386f84094d471809c023551..f4f0d6d84a514e3d6b778ed3a2ef7c14c107dec0 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -395,3 +395,25 @@ vboxDomainSave(virDomainPtr dom, const char *path ATTRIBUTE_UNUSED)
     vboxIIDUnalloc(&iid);
     return ret;
 }
+
+static void vboxDriverLock(vboxGlobalData *data)
+{
+    virMutexLock(&data->lock);
+}
+
+static void vboxDriverUnlock(vboxGlobalData *data)
+{
+    virMutexUnlock(&data->lock);
+}
+
+int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version)
+{
+    vboxGlobalData *data = conn->privateData;
+    VIR_DEBUG("%s: in vboxGetVersion", conn->driver->name);
+
+    vboxDriverLock(data);
+    *version = data->version;
+    vboxDriverUnlock(data);
+
+    return 0;
+}

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 039ab117a661bb1a1d6d7ec5ea8c68c65fccfa72..d7f743d5ffc2d362cc6694f83a16c8050660adac 100644 (file)
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -914,19 +914,6 @@ vboxSocketParseAddrUtf16(vboxGlobalData *data, const PRUnichar *utf16,
     return result;
 }
 
-static int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version)
-{
-    vboxGlobalData *data = conn->privateData;
-    VIR_DEBUG("%s: in vboxGetVersion", conn->driver->name);
-
-    vboxDriverLock(data);
-    *version = data->version;
-    vboxDriverUnlock(data);
-
-    return 0;
-}
-
-
 static char *vboxConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED)
 {
     return virGetHostname();

diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h
index 85387543d5186b8e64ff325380fd034964536991..5bb2e6522d6150ad0fee1c1e1dc772f59100c069 100644 (file)
--- a/src/vbox/vbox_uniformed_api.h
+++ b/src/vbox/vbox_uniformed_api.h
@@ -220,6 +220,7 @@ virDrvOpenStatus vboxConnectOpen(virConnectPtr conn,
                                  unsigned int flags);
 int vboxConnectClose(virConnectPtr conn);
 int vboxDomainSave(virDomainPtr dom, const char *path);
+int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version);
 
 /* Version specified functions for installing uniformed API */
 void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);