From 1adda68a1b60a1f1a42bab5801e1529059d34ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Thu, 18 Dec 2014 12:45:04 +0100 Subject: [PATCH] Remove redundant cleanup in qemuDomainAttachVirtioDiskDevice 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 a8862d91b2..7f93b9be68 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; } -- GitLab