[libvirt] [PATCH 08/12] qemu: hotplug: Adjust error path for attach scsi disk
Shortly a new object could be added making this code even more confusing,
so let's just adjust the exit path now to make it clearer.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/qemu/qemu_hotplug.c | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index c3edd40..ec30ce7 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -592,29 +592,22 @@ qemuDomainAttachSCSIDisk(virConnectPtr conn,
if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks+1) < 0)
goto error;
+ /* Attach the device - 2 step process */
qemuDomainObjEnterMonitor(driver, vm);
- ret = qemuMonitorAddDrive(priv->mon, drivestr);
- if (ret == 0) {
- ret = qemuMonitorAddDevice(priv->mon, devstr);
- if (ret < 0) {
- VIR_WARN("qemuMonitorAddDevice failed on %s (%s)",
- drivestr, devstr);
- /* XXX should call 'drive_del' on error but this does not exist yet
*/
- }
- }
+ if (qemuMonitorAddDrive(priv->mon, drivestr) < 0)
+ goto failadddrive;
- if (qemuDomainObjExitMonitor(driver, vm) < 0) {
- ret = -1;
- goto error;
- }
+ if (qemuMonitorAddDevice(priv->mon, devstr) < 0)
+ goto failadddevice;
- virDomainAuditDisk(vm, NULL, disk->src, "attach", ret >= 0);
+ if (qemuDomainObjExitMonitor(driver, vm) < 0)
+ goto failexitmon;
- if (ret < 0)
- goto error;
+ virDomainAuditDisk(vm, NULL, disk->src, "attach", true);
virDomainDiskInsertPreAlloced(vm->def, disk);
+ ret = 0;
cleanup:
qemuDomainSecretDiskDestroy(disk);
@@ -623,6 +616,16 @@ qemuDomainAttachSCSIDisk(virConnectPtr conn,
virObjectUnref(cfg);
return ret;
+ failadddevice:
+ /* XXX should call 'drive_del' on error but this does not exist yet */
+ VIR_WARN("qemuMonitorAddDevice failed on %s (%s)", drivestr, devstr);
+
+ failadddrive:
+ ignore_value(qemuDomainObjExitMonitor(driver, vm));
+
+ failexitmon:
+ virDomainAuditDisk(vm, NULL, disk->src, "attach", false);
+
error:
ignore_value(qemuDomainPrepareDisk(driver, vm, disk, NULL, true));
goto cleanup;
--
2.5.5