From 04695f48b2440292d63210c012727584c65fe75f Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 11 May 2015 17:05:21 +0200 Subject: [PATCH] qemuDomainDetachChrDevice: Fix chardev hot-unplug Not every chardev is plugged onto virtio-serial bus. However, the code introduced in 89e991a2aa36b04 assumes that. Incorrectly. With previous patches we have three options where a chardev can be plugged: virtio-serial, USB and PCI. This commit fixes the detach part. However, since we are not auto allocating USB addresses yet, I'm just marking the place where appropriate code should go. Signed-off-by: Michal Privoznik --- src/qemu/qemu_hotplug.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fe58154084..170768b3bf 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4164,7 +4164,13 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver, rc = qemuDomainWaitForDeviceRemoval(vm); if (rc == 0 || rc == 1) { - virDomainVirtioSerialAddrRelease(priv->vioserialaddrs, &tmpChr->info); + if (chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI) { + qemuDomainReleaseDeviceAddress(vm, &tmpChr->info, NULL); + } else if (chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB) { + /* XXX */ + } else { + virDomainVirtioSerialAddrRelease(priv->vioserialaddrs, &tmpChr->info); + } ret = qemuDomainRemoveChrDevice(driver, vm, tmpChr); } else { ret = 0; -- GitLab