External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 09:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_hotplug: Don't build device string in qemuDomainDetachChrDevice

Browse Source 
This is basically an old artefact from 24b0821926e when the idea
was:

1) Build device string only to see if chardev has any -device
associated with it and thus if device_del is needed
2) Detach chardev using chardev_del

Now, that DEVICE and DEVICE_DELETED capabilities are assumed for
every domain 1) does not make sense anymore.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Michal Privoznik 2019-02-14 10:38:09 +01:00
parent 17ddfd420a
commit 0c17685760
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qemu/qemu_hotplug.c
View File

@ -6129,7 +6129,6 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virDomainDefPtr vmdef = vm->def; virDomainDefPtr vmdef = vm->def;
virDomainChrDefPtr tmpChr; virDomainChrDefPtr tmpChr;
char *devstr = NULL;
bool guestfwd = false; bool guestfwd = false;
if (!(tmpChr = virDomainChrFind(vmdef, chr))) { if (!(tmpChr = virDomainChrFind(vmdef, chr))) {
@ -6150,9 +6149,6 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
sa_assert(tmpChr->info.alias); sa_assert(tmpChr->info.alias);
if (qemuBuildChrDeviceStr(&devstr, vmdef, tmpChr, priv->qemuCaps) < 0)
goto cleanup;
if (!async && !guestfwd) if (!async && !guestfwd)
qemuDomainMarkDeviceForRemoval(vm, &tmpChr->info); qemuDomainMarkDeviceForRemoval(vm, &tmpChr->info);
@ -6163,7 +6159,7 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
} }
} else { } else {
if (devstr && qemuMonitorDelDevice(priv->mon, tmpChr->info.alias) < 0) { if (qemuMonitorDelDevice(priv->mon, tmpChr->info.alias) < 0) {
ignore_value(qemuDomainObjExitMonitor(driver, vm)); ignore_value(qemuDomainObjExitMonitor(driver, vm));
goto cleanup; goto cleanup;
} }
@ -6183,7 +6179,6 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
cleanup: cleanup:
if (!async) if (!async)
qemuDomainResetDeviceRemoval(vm); qemuDomainResetDeviceRemoval(vm);
VIR_FREE(devstr);
return ret; return ret;
} }