[libvirt] [PATCH v2 6/9] qemu: Add attempt to call qemuMonitorDriveDel for AttachSCSI failure path
Completion of fix for:
https://bugzilla.redhat.com/show_bug.cgi?id=1336225
Similar to the other disk types, add the qemuMonitorDriveDel in the failure
to add/hotplug a SCSI disk.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/qemu/qemu_hotplug.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 47ca38c..9576509 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -593,6 +593,7 @@ qemuDomainAttachSCSIDisk(virConnectPtr conn,
char *devstr = NULL;
bool driveAdded = false;
bool encobjAdded = false;
+ char *drivealias = NULL;
int ret = -1;
int rv;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
@@ -640,6 +641,9 @@ qemuDomainAttachSCSIDisk(virConnectPtr conn,
if (!(drivestr = qemuBuildDriveStr(disk, false, priv->qemuCaps)))
goto error;
+ if (!(drivealias = qemuAssignDeviceDiskDriveAlias(disk->info.alias)))
+ goto error;
+
if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks+1) < 0)
goto error;
@@ -674,13 +678,20 @@ qemuDomainAttachSCSIDisk(virConnectPtr conn,
qemuDomainSecretDiskDestroy(disk);
VIR_FREE(devstr);
VIR_FREE(drivestr);
+ VIR_FREE(drivealias);
virObjectUnref(cfg);
return ret;
exit_monitor:
- /* XXX should call 'drive_del' on error but this does not exist yet */
- if (driveAdded)
- VIR_WARN("qemuMonitorAddDevice failed on %s (%s)", drivestr, devstr);
+ orig_err = virSaveLastError();
+ if (driveAdded && qemuMonitorDriveDel(priv->mon, drivealias) < 0) {
+ VIR_WARN("Unable to remove drive %s (%s) after failed "
+ "qemuMonitorAddDevice", drivealias, drivestr);
+ }
+ if (orig_err) {
+ virSetError(orig_err);
+ virFreeError(orig_err);
+ }
orig_err = virSaveLastError();
if (encobjAdded)
--
2.5.5