[libvirt] [PATCH 18/66] vbox: Rewrite vboxDomainCreate

Taowei uaedante at gmail.com
Mon Aug 11 10:06:21 UTC 2014


---
 src/vbox/vbox_common.c        |    5 +++++
 src/vbox/vbox_tmpl.c          |    7 -------
 src/vbox/vbox_uniformed_api.h |    1 +
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 16c8f44..4957655 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -2155,3 +2155,8 @@ int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags)
  cleanup:
     return ret;
 }
+
+int vboxDomainCreate(virDomainPtr dom)
+{
+    return vboxDomainCreateWithFlags(dom, 0);
+}
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 177dc55..d9d0c3d 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -265,8 +265,6 @@ static vboxGlobalData *g_pVBoxGlobalData = NULL;
 
 #endif /* VBOX_API_VERSION >= 4000000 */
 
-static int vboxDomainCreate(virDomainPtr dom);
-
 #if VBOX_API_VERSION > 2002000 && VBOX_API_VERSION < 4000000
 /* Since vboxConnectGetCapabilities has been rewriten,
  * vboxDiverLock and Unlock only be used in 3.* */
@@ -3080,11 +3078,6 @@ static int vboxConnectNumOfDefinedDomains(virConnectPtr conn)
     return ret;
 }
 
-static int vboxDomainCreate(virDomainPtr dom)
-{
-    return vboxDomainCreateWithFlags(dom, 0);
-}
-
 #if VBOX_API_VERSION < 3001000
 
 static void
diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h
index ff03749..e745bc7 100644
--- a/src/vbox/vbox_uniformed_api.h
+++ b/src/vbox/vbox_uniformed_api.h
@@ -406,6 +406,7 @@ virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn,
 virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml);
 int vboxDomainUndefineFlags(virDomainPtr dom, unsigned int flags);
 int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags);
+int vboxDomainCreate(virDomainPtr dom);
 
 /* Version specified functions for installing uniformed API */
 void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
-- 
1.7.9.5




More information about the libvir-list mailing list