]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
Remove redundant cleanup in qemuDomainAttachVirtioDiskDevice
authorJán Tomko <jtomko@redhat.com>
Thu, 18 Dec 2014 11:45:04 +0000 (12:45 +0100)
committerJán Tomko <jtomko@redhat.com>
Thu, 18 Dec 2014 11:53:56 +0000 (12:53 +0100)
Commit ca91ba7 moved these into the qemuDomainPrepareDisk helper,
but forgot to remove them from here as well.

src/qemu/qemu_hotplug.c

index a8862d91b21b4e4510ce48ac27bb25eb1741f3c7..7f93b9be686a0e52bc6b19d69419df8376488c0a 100644 (file)
@@ -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;
 }