[libvirt] [PATCH 28/29] vbox: Rewrite vboxDomainShutdown

Taowei uaedante at gmail.com
Fri Jul 18 07:47:10 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 cc4328e..98d7c8a 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -2496,3 +2496,8 @@ int vboxDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
     vboxIIDUnalloc(&iid);
     return ret;
 }
+
+int vboxDomainShutdown(virDomainPtr dom)
+{
+    return vboxDomainShutdownFlags(dom, 0);
+}
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 1ec0a3b..28bf9be 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -916,12 +916,6 @@ vboxSocketParseAddrUtf16(vboxGlobalData *data, const PRUnichar *utf16,
     return result;
 }
 
-static int vboxDomainShutdown(virDomainPtr dom)
-{
-    return vboxDomainShutdownFlags(dom, 0);
-}
-
-
 static int vboxDomainReboot(virDomainPtr dom, unsigned int flags)
 {
     VBOX_OBJECT_CHECK(dom->conn, int, -1);
diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h
index 52a8cee..5926a2a 100644
--- a/src/vbox/vbox_uniformed_api.h
+++ b/src/vbox/vbox_uniformed_api.h
@@ -440,6 +440,7 @@ int vboxDomainIsUpdated(virDomainPtr dom);
 int vboxDomainSuspend(virDomainPtr dom);
 int vboxDomainResume(virDomainPtr dom);
 int vboxDomainShutdownFlags(virDomainPtr dom, unsigned int flags);
+int vboxDomainShutdown(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