From 502c43ee4453e8e15508e20711d8e704e3a41d63 Mon Sep 17 00:00:00 2001 From: Taowei Date: Mon, 11 Aug 2014 18:06:30 +0800 Subject: [PATCH] vbox: Rewrite vboxDomainShutdown --- 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 d0a6586937..7204dd0e41 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -2504,3 +2504,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 541eef432e..c1d6519ffa 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 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 bfd53395af..bf53b27c62 100644 --- a/src/vbox/vbox_uniformed_api.h +++ b/src/vbox/vbox_uniformed_api.h @@ -423,6 +423,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);