From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 18 May 2021 14:11:52 +0000 (+0200)
Subject: qemu: hotplug: Move post-insertion steps of disk hotplug to qemuDomainAttachDeviceDis... 
X-Git-Tag: v7.4.0-rc1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da522bab22b8a6ff06322467e31612a987d229ad;p=thirdparty%2Flibvirt.git

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

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>
---

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));