External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Fix detaching from persistent def in qemuDomainDetachDeviceAliasLiveAndConfig

Browse Source 
The code that detaches the device from persistent definition copies the
persistent definition first so that it can easily be rolled back. The
actual detaching is then made in the copy which is assigned back on
success (if the live operation succeeded as well).

This is not the case in qemuDomainDetachDeviceAliasLiveAndConfig where
the definition was copied and put back, but the detaching happened from
the other object which was overwritten.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Peter Krempa 2018-06-05 09:35:12 +02:00
parent 234ce7d02f
commit d7ca39e0fb
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qemu/qemu_driver.c
View File

@ -8822,14 +8822,13 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDriverPtr driver,
if (persistentDef) { if (persistentDef) {
virDomainDeviceDef dev; virDomainDeviceDef dev;
vmdef = virDomainObjCopyPersistentDef(vm, caps, driver->xmlopt); if (!(vmdef = virDomainObjCopyPersistentDef(vm, caps, driver->xmlopt)))
if (!vmdef)
goto cleanup; goto cleanup;
if (virDomainDefFindDevice(persistentDef, alias, &dev, true) < 0) if (virDomainDefFindDevice(vmdef, alias, &dev, true) < 0)
goto cleanup; goto cleanup;
if (qemuDomainDetachDeviceConfig(persistentDef, &dev, caps, if (qemuDomainDetachDeviceConfig(vmdef, &dev, caps,
parse_flags, driver->xmlopt) < 0) parse_flags, driver->xmlopt) < 0)
goto cleanup; goto cleanup;
} }