提交 6ec7195c 编写于 作者: M Michal Privoznik

destroy: Implement internal API for vbox driver

上级 64ce43f8
...@@ -1689,7 +1689,10 @@ cleanup: ...@@ -1689,7 +1689,10 @@ cleanup:
return ret; return ret;
} }
static int vboxDomainDestroy(virDomainPtr dom) { static int
vboxDomainDestroyFlags(virDomainPtr dom,
unsigned int flags)
{
VBOX_OBJECT_CHECK(dom->conn, int, -1); VBOX_OBJECT_CHECK(dom->conn, int, -1);
IMachine *machine = NULL; IMachine *machine = NULL;
vboxIID iid = VBOX_IID_INITIALIZER; vboxIID iid = VBOX_IID_INITIALIZER;
...@@ -1698,6 +1701,8 @@ static int vboxDomainDestroy(virDomainPtr dom) { ...@@ -1698,6 +1701,8 @@ static int vboxDomainDestroy(virDomainPtr dom) {
PRBool isAccessible = PR_FALSE; PRBool isAccessible = PR_FALSE;
nsresult rc; nsresult rc;
virCheckFlags(0, -1);
vboxIIDFromUUID(&iid, dom->uuid); vboxIIDFromUUID(&iid, dom->uuid);
rc = VBOX_OBJECT_GET_MACHINE(iid.value, &machine); rc = VBOX_OBJECT_GET_MACHINE(iid.value, &machine);
if (NS_FAILED(rc)) { if (NS_FAILED(rc)) {
...@@ -1746,6 +1751,12 @@ cleanup: ...@@ -1746,6 +1751,12 @@ cleanup:
return ret; return ret;
} }
static int
vboxDomainDestroy(virDomainPtr dom)
{
return vboxDomainDestroyFlags(dom, 0);
}
static char *vboxDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) { static char *vboxDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) {
/* Returning "hvm" always as suggested on list, cause /* Returning "hvm" always as suggested on list, cause
* this functions seems to be badly named and it * this functions seems to be badly named and it
...@@ -8774,6 +8785,7 @@ virDriver NAME(Driver) = { ...@@ -8774,6 +8785,7 @@ virDriver NAME(Driver) = {
.domainShutdown = vboxDomainShutdown, /* 0.6.3 */ .domainShutdown = vboxDomainShutdown, /* 0.6.3 */
.domainReboot = vboxDomainReboot, /* 0.6.3 */ .domainReboot = vboxDomainReboot, /* 0.6.3 */
.domainDestroy = vboxDomainDestroy, /* 0.6.3 */ .domainDestroy = vboxDomainDestroy, /* 0.6.3 */
.domainDestroyFlags = vboxDomainDestroyFlags, /* 0.9.4 */
.domainGetOSType = vboxDomainGetOSType, /* 0.6.3 */ .domainGetOSType = vboxDomainGetOSType, /* 0.6.3 */
.domainSetMemory = vboxDomainSetMemory, /* 0.6.3 */ .domainSetMemory = vboxDomainSetMemory, /* 0.6.3 */
.domainGetInfo = vboxDomainGetInfo, /* 0.6.3 */ .domainGetInfo = vboxDomainGetInfo, /* 0.6.3 */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册