[libvirt] [PATCH 2/2] Remove redundant cleanup in qemuDomainAttachVirtioDiskDevice

Ján Tomko jtomko at redhat.com
Thu Dec 18 12:04:46 UTC 2014


Commit ca91ba7 moved these into the qemuDomainPrepareDisk helper,
but forgot to remove them from here as well.
---
 src/qemu/qemu_hotplug.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index a8862d9..7f93b9b 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -411,14 +411,6 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn,
         qemuDomainReleaseDeviceAddress(vm, &disk->info, src);
 
     ignore_value(qemuDomainPrepareDisk(driver, vm, disk, NULL, true));
-
-    if (virSecurityManagerRestoreDiskLabel(driver->securityManager,
-                                           vm->def, disk) < 0)
-        VIR_WARN("Unable to restore security label on %s", src);
-
-    if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0)
-        VIR_WARN("Unable to release lock on %s", src);
-
     goto cleanup;
 }
 
-- 
2.0.4




More information about the libvir-list mailing list