From da522bab22b8a6ff06322467e31612a987d229ad Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 18 May 2021 16:11:52 +0200 Subject: [PATCH] qemu: hotplug: Move post-insertion steps of disk hotplug to qemuDomainAttachDeviceDiskLiveInternal MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Ján Tomko Reviewed-by: Pavel Hrdina --- src/qemu/qemu_hotplug.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 80ade33e1c..f645e5ec8f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -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)); -- 2.47.2