[libvirt] [PATCH 30/66] vbox: Rewrite vboxDomainDestroy

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


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

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index aaebc44..f889384 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -2598,3 +2598,8 @@ int vboxDomainDestroyFlags(virDomainPtr dom, unsigned int flags)
     vboxIIDUnalloc(&iid);
     return ret;
 }
+
+int vboxDomainDestroy(virDomainPtr dom)
+{
+    return vboxDomainDestroyFlags(dom, 0);
+}
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index c3f14be..3c4cd35 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -932,12 +932,6 @@ vboxSocketParseAddrUtf16(vboxGlobalData *data, const PRUnichar *utf16,
     return result;
 }
 
-static int
-vboxDomainDestroy(virDomainPtr dom)
-{
-    return vboxDomainDestroyFlags(dom, 0);
-}
-
 static char *vboxDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) {
     /* Returning "hvm" always as suggested on list, cause
      * this functions seems to be badly named and it
diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h
index b9c2068..935697f 100644
--- a/src/vbox/vbox_uniformed_api.h
+++ b/src/vbox/vbox_uniformed_api.h
@@ -428,6 +428,7 @@ int vboxDomainShutdownFlags(virDomainPtr dom, unsigned int flags);
 int vboxDomainShutdown(virDomainPtr dom);
 int vboxDomainReboot(virDomainPtr dom, unsigned int flags);
 int vboxDomainDestroyFlags(virDomainPtr dom, unsigned int flags);
+int vboxDomainDestroy(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