mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-30 21:47:18 +00:00
qemuDomainDetachChrDevice: Fix chardev hot-unplug
Not every chardev is plugged onto virtio-serial bus. However, the
code introduced in 89e991a2aa
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 <mprivozn@redhat.com>
This commit is contained in:
parent
9807c47147
commit
04695f48b2
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user