From e979ad3991b12cb51442e9cb23c3fed73224bef2 Mon Sep 17 00:00:00 2001 From: Taowei Date: Mon, 11 Aug 2014 18:06:21 +0800 Subject: [PATCH] vbox: Rewrite vboxDomainCreate --- 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 8a9c600449..f0e8703bc8 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 4d1062ae4d..bbc2ee5745 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 rewritten, * vboxDriverLock and vboxDriverUnlock only be used in code for @@ -3081,11 +3079,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 ff03749c84..e745bc7450 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);