NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Add attempt to call qemuMonitorDriveDel for USB failure path

Browse Source 
Partial 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 USB.

Added a couple of other formatting changes just to have a less cluttered look
This commit is contained in:
John Ferlan 2016-06-29 16:32:58 -04:00
parent dd0dbe1d66
commit 190e22c06b
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qemu/qemu_hotplug.c
View File

@ -715,7 +715,9 @@ qemuDomainAttachUSBMassStorageDevice(virQEMUDriverPtr driver,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virErrorPtr orig_err;
int ret = -1; int ret = -1;
char *drivealias = NULL;
char *drivestr = NULL; char *drivestr = NULL;
char *devstr = NULL; char *devstr = NULL;
bool driveAdded = false; bool driveAdded = false;
@ -741,8 +743,13 @@ qemuDomainAttachUSBMassStorageDevice(virQEMUDriverPtr driver,
if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0) if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0)
goto error; goto error;
if (!(drivestr = qemuBuildDriveStr(disk, false, priv->qemuCaps))) if (!(drivestr = qemuBuildDriveStr(disk, false, priv->qemuCaps)))
goto error; goto error;
if (!(drivealias = qemuAliasFromDisk(disk)))
goto error;
if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps))) if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps)))
goto error; goto error;
@ -770,16 +777,20 @@ qemuDomainAttachUSBMassStorageDevice(virQEMUDriverPtr driver,
if (ret < 0 && releaseaddr) if (ret < 0 && releaseaddr)
virDomainUSBAddressRelease(priv->usbaddrs, &disk->info); virDomainUSBAddressRelease(priv->usbaddrs, &disk->info);
VIR_FREE(devstr); VIR_FREE(devstr);
VIR_FREE(drivealias);
VIR_FREE(drivestr); VIR_FREE(drivestr);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;
exit_monitor: exit_monitor:
if (driveAdded) { orig_err = virSaveLastError();
VIR_WARN("qemuMonitorAddDevice failed on %s (%s)", if (driveAdded && qemuMonitorDriveDel(priv->mon, drivealias) < 0) {
drivestr, devstr); VIR_WARN("Unable to remove drive %s (%s) after failed "
/* XXX should call 'drive_del' on error but this does not "qemuMonitorAddDevice", drivealias, drivestr);
exist yet */ }
if (orig_err) {
virSetError(orig_err);
virFreeError(orig_err);
} }
ignore_value(qemuDomainObjExitMonitor(driver, vm)); ignore_value(qemuDomainObjExitMonitor(driver, vm));