[libvirt] [PATCH 04/11] qemu: hotplug: Use more common 'cleanup' label in qemuDomainAttachDeviceDiskLive

--- src/qemu/qemu_hotplug.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 43f686c..fa83c6e 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -779,20 +779,20 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported driver name '%s' for disk '%s'"), virDomainDiskGetDriver(disk), src); - goto end; + goto cleanup; } if (virStorageTranslateDiskSourcePool(conn, disk) < 0) - goto end; + goto cleanup; if (qemuAddSharedDevice(driver, dev, vm->def->name) < 0) - goto end; + goto cleanup; if (qemuSetUnprivSGIO(dev) < 0) - goto end; + goto cleanup; if (qemuDomainDetermineDiskChain(driver, vm, disk, false, true) < 0) - goto end; + goto cleanup; switch ((virDomainDiskDevice) disk->device) { case VIR_DOMAIN_DISK_DEVICE_CDROM: @@ -805,12 +805,12 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, "by libvirt"), virDomainDiskBusTypeToString(disk->bus), disk->dst); - goto end; + goto cleanup; } if (qemuDomainChangeEjectableMedia(driver, conn, vm, orig_disk, disk->src, false) < 0) - goto end; + goto cleanup; disk->src = NULL; ret = 0; @@ -853,7 +853,7 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, break; } - end: + cleanup: if (ret != 0) ignore_value(qemuRemoveSharedDevice(driver, dev, vm->def->name)); return ret; -- 2.6.2