]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: cold-unplug of watchdog
authorMichal Privoznik <mprivozn@redhat.com>
Tue, 5 Sep 2017 08:13:05 +0000 (10:13 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 12 Sep 2017 13:59:38 +0000 (15:59 +0200)
https://bugzilla.redhat.com/show_bug.cgi?id=1447169

Again, no special here.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
src/libvirt_private.syms
src/qemu/qemu_driver.c

index f30a04b145cb3ecab0edc4fbe7d72b8ce3f62800..247d1175ba0e359c1602e631e6ef3186aa5c03ca 100644 (file)
@@ -539,6 +539,7 @@ virDomainVirtTypeFromString;
 virDomainVirtTypeToString;
 virDomainWatchdogActionTypeFromString;
 virDomainWatchdogActionTypeToString;
+virDomainWatchdogDefFree;
 virDomainWatchdogModelTypeFromString;
 virDomainWatchdogModelTypeToString;
 virDomainXMLOptionGetNamespace;
index 7c62ec01b9afd27ca2290734e7d0f2b1d0b66c1f..562f6743f0916c99148e5b67ae76cae1f414e875 100644 (file)
@@ -8169,10 +8169,19 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
         break;
 
 
+    case VIR_DOMAIN_DEVICE_WATCHDOG:
+        if (!vmdef->watchdog) {
+            virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+                           _("domain has no watchdog"));
+            return -1;
+        }
+        virDomainWatchdogDefFree(vmdef->watchdog);
+        vmdef->watchdog = NULL;
+        break;
+
     case VIR_DOMAIN_DEVICE_INPUT:
     case VIR_DOMAIN_DEVICE_SOUND:
     case VIR_DOMAIN_DEVICE_VIDEO:
-    case VIR_DOMAIN_DEVICE_WATCHDOG:
     case VIR_DOMAIN_DEVICE_GRAPHICS:
     case VIR_DOMAIN_DEVICE_HUB:
     case VIR_DOMAIN_DEVICE_SMARTCARD: