From 539f74e8855ff7d8a0d0395976fe9d2e7ef933b8 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 11 Jul 2018 17:21:36 +0200 Subject: [PATCH] qemu: hotplug: Reuse qemuHotplugPrepareDiskAccess in qemuDomainRemoveDiskDevice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qemuHotplugPrepareDiskAccess can be used to tear down disk access so we can replace the open-coded version collecting the same function calls. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_hotplug.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 978dd8af72..1a8ef8bbac 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3831,17 +3831,8 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, qemuDomainReleaseDeviceAddress(vm, &disk->info, src); - if (qemuSecurityRestoreDiskLabel(driver, vm, disk) < 0) - VIR_WARN("Unable to restore security label on %s", src); - - if (qemuTeardownDiskCgroup(vm, disk) < 0) - VIR_WARN("Failed to tear down cgroup for disk path %s", src); - - if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0) - VIR_WARN("Unable to release lock on %s", src); - - if (qemuDomainNamespaceTeardownDisk(vm, disk->src) < 0) - VIR_WARN("Unable to remove /dev entry for %s", src); + /* tear down disk security access */ + qemuHotplugPrepareDiskAccess(driver, vm, disk, NULL, true); dev.type = VIR_DOMAIN_DEVICE_DISK; dev.data.disk = disk; -- GitLab