NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: hotplug: Move post-insertion steps of disk hotplug to qemuDomainAttachDeviceDiskLiveInternal

Browse Source 
Move the auditing entry and insertion into the disk definition from the
function which deals with qemu to 'qemuDomainAttachDeviceDiskLiveInternal'
which deals with the hotplug related specifics.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa
2021-05-18 16:11:52 +02:00
parent 52f8655439
commit da522bab22
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu_hotplug.c
View File

@@ -763,9 +763,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver,
goto cleanup;
}
virDomainAuditDisk(vm, NULL, disk->src, "attach", true);
virDomainDiskInsert(vm->def, disk);
ret = 0;
cleanup:
@@ -781,7 +778,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver,
qemuHotplugRemoveManagedPR(driver, vm, QEMU_ASYNC_JOB_NONE) < 0)
ret = -2;
virDomainAuditDisk(vm, NULL, disk->src, "attach", false);
goto cleanup;
}
@@ -1040,6 +1036,13 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver,
ret = qemuDomainAttachDiskGeneric(driver, vm, disk);
virDomainAuditDisk(vm, NULL, disk->src, "attach", ret == 0);
if (ret < 0)
goto cleanup;
virDomainDiskInsert(vm->def, disk);
cleanup:
if (ret < 0) {
ignore_value(qemuRemoveSharedDevice(driver, dev, vm->def->name));