qemu: cold-unplug of watchdog

https://bugzilla.redhat.com/show_bug.cgi?id=1447169

Again, no special here.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2017-09-05 10:13:05 +02:00
parent 50c1dbafae
commit 607a00d170
2 changed files with 11 additions and 1 deletions

View File

@ -539,6 +539,7 @@ virDomainVirtTypeFromString;
virDomainVirtTypeToString; virDomainVirtTypeToString;
virDomainWatchdogActionTypeFromString; virDomainWatchdogActionTypeFromString;
virDomainWatchdogActionTypeToString; virDomainWatchdogActionTypeToString;
virDomainWatchdogDefFree;
virDomainWatchdogModelTypeFromString; virDomainWatchdogModelTypeFromString;
virDomainWatchdogModelTypeToString; virDomainWatchdogModelTypeToString;
virDomainXMLOptionGetNamespace; virDomainXMLOptionGetNamespace;

View File

@ -8169,10 +8169,19 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
break; 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_INPUT:
case VIR_DOMAIN_DEVICE_SOUND: case VIR_DOMAIN_DEVICE_SOUND:
case VIR_DOMAIN_DEVICE_VIDEO: case VIR_DOMAIN_DEVICE_VIDEO:
case VIR_DOMAIN_DEVICE_WATCHDOG:
case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_GRAPHICS:
case VIR_DOMAIN_DEVICE_HUB: case VIR_DOMAIN_DEVICE_HUB:
case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_SMARTCARD: