From 400bdccb2ab18a5ae3d0f17d25969afba15ba258 Mon Sep 17 00:00:00 2001 From: Taowei Date: Mon, 11 Aug 2014 18:06:46 +0800 Subject: [PATCH] vbox: Rewrite vboxDomainUndefine --- 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 0741ff732f..3c1f15c414 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -2066,6 +2066,11 @@ int vboxDomainUndefineFlags(virDomainPtr dom, unsigned int flags) return ret; } +int vboxDomainUndefine(virDomainPtr dom) +{ + return vboxDomainUndefineFlags(dom, 0); +} + static int vboxStartMachine(virDomainPtr dom, int maxDomID, IMachine *machine, vboxIIDUnion *iid) { diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index f626cda153..6b53d66b88 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1451,12 +1451,6 @@ _vboxAttachDrivesOld(virDomainDefPtr def ATTRIBUTE_UNUSED, #endif /* VBOX_API_VERSION >= 4000000 */ -static int -vboxDomainUndefine(virDomainPtr dom) -{ - return vboxDomainUndefineFlags(dom, 0); -} - static int vboxDomainAttachDeviceImpl(virDomainPtr dom, const char *xml, int mediaChangeOnly ATTRIBUTE_UNUSED) diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h index f57eaa952a..9488999517 100644 --- a/src/vbox/vbox_uniformed_api.h +++ b/src/vbox/vbox_uniformed_api.h @@ -493,6 +493,7 @@ virDomainPtr vboxDomainLookupByName(virConnectPtr conn, const char *name); virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml); int vboxDomainUndefineFlags(virDomainPtr dom, unsigned int flags); +int vboxDomainUndefine(virDomainPtr dom); int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags); int vboxDomainCreate(virDomainPtr dom); virDomainPtr vboxDomainCreateXML(virConnectPtr conn, const char *xml, -- GitLab