From 40b733e7e21bcb9cf53ce8b406965978472bb4de Mon Sep 17 00:00:00 2001
From: Taowei <uaedante@gmail.com>
Date: Mon, 11 Aug 2014 18:06:33 +0800
Subject: [PATCH] vbox: Rewrite vboxDomainDestroy

---
 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 baaadc4d20..7acd80e232 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 a2b45a7971..c1511affe3 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -933,12 +933,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 b9c206823a..935697fbec 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);