]> xenbits.xensource.com Git - libvirt.git/commitdiff
Mark the domain as active in qemuhotplugtest
authorJán Tomko <jtomko@redhat.com>
Tue, 16 Dec 2014 07:46:44 +0000 (08:46 +0100)
committerJán Tomko <jtomko@redhat.com>
Wed, 14 Jan 2015 18:30:32 +0000 (19:30 +0100)
This will allow us to call qemuDomainObjIsActive() in
the tested functions to check if the domain has crashed.

tests/qemuhotplugtest.c

index 8bdd37f56b445b8e5553a62e68f7d4d155048424..1c18dbbc44ae0a28307f5b16ed258d1a2866de06 100644 (file)
@@ -40,6 +40,8 @@ enum {
     UPDATE
 };
 
+#define QEMU_HOTPLUG_TEST_DOMAIN_ID 7
+
 struct qemuHotplugTestData {
     const char *domain_filename;
     const char *device_filename;
@@ -90,6 +92,8 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt,
     if (qemuAssignDeviceAliases((*vm)->def, priv->qemuCaps) < 0)
         goto cleanup;
 
+    (*vm)->def->id = QEMU_HOTPLUG_TEST_DOMAIN_ID;
+
     ret = 0;
  cleanup:
     return ret;
@@ -177,9 +181,11 @@ testQemuHotplugCheckResult(virDomainObjPtr vm,
     char *actual;
     int ret;
 
+    vm->def->id = -1;
     actual = virDomainDefFormat(vm->def, VIR_DOMAIN_DEF_FORMAT_SECURE);
     if (!actual)
         return -1;
+    vm->def->id = QEMU_HOTPLUG_TEST_DOMAIN_ID;
 
     if (STREQ(expected, actual)) {
         if (fail && virTestGetVerbose())