]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu_hotplug: Assume chardev alias always exists in qemuDomainDetachChrDevice
authorMichal Privoznik <mprivozn@redhat.com>
Thu, 14 Feb 2019 09:44:15 +0000 (10:44 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Thu, 14 Feb 2019 12:44:56 +0000 (13:44 +0100)
The @tmpChr is looked up in domain definition based on user
provided chardev XML. Therefore, the alias must have been
allocated already when domain was started up.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
src/qemu/qemu_hotplug.c

index 60b393234a4a2697af253a67997609d391e4f253..a5c352f44b684265eec4dab55883ed7ccbd852a2 100644 (file)
@@ -6144,11 +6144,6 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
     guestfwd = tmpChr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL &&
                tmpChr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD;
 
-    if (!tmpChr->info.alias && qemuAssignDeviceChrAlias(vmdef, tmpChr, -1) < 0)
-        goto cleanup;
-
-    sa_assert(tmpChr->info.alias);
-
     if (!async && !guestfwd)
         qemuDomainMarkDeviceForRemoval(vm, &tmpChr->info);