External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-26 15:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: hotplug: Properly clean up drive backend if frontend hotplug fails

Browse Source 
Commit 8125113c added code that should remove the disk backend if the
fronted hotplug failed for any reason. The code had a bug though as it
used the disk string for unplug rather than the backend alias. Fix the
code by pre-creating an alias string and using it instead of the disk
string. In cases where qemu does not support QEMU_CAPS_DEVICE, we ignore
the unplug of the backend since we can't really create an alias in that
case.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1262399
(cherry picked from commit 64c6695f1a)
This commit is contained in:
Peter Krempa 2015-09-11 17:34:18 +02:00 committed by Cole Robinson
parent 9372343f7c
commit 66899258e1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_hotplug.c
View File

@ -321,6 +321,7 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn,
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
char *devstr = NULL; char *devstr = NULL;
char *drivestr = NULL; char *drivestr = NULL;
char *drivealias = NULL;
bool releaseaddr = false; bool releaseaddr = false;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
const char *src = virDomainDiskGetSource(disk); const char *src = virDomainDiskGetSource(disk);
@ -361,6 +362,9 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn,
if (!(drivestr = qemuBuildDriveStr(conn, disk, false, priv->qemuCaps))) if (!(drivestr = qemuBuildDriveStr(conn, disk, false, priv->qemuCaps)))
goto error; goto error;
if (!(drivealias = qemuDeviceDriveHostAlias(disk, priv->qemuCaps)))
goto error;
if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps))) if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps)))
goto error; goto error;
} }
@ -375,10 +379,11 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn,
ret = qemuMonitorAddDevice(priv->mon, devstr); ret = qemuMonitorAddDevice(priv->mon, devstr);
if (ret < 0) { if (ret < 0) {
virErrorPtr orig_err = virSaveLastError(); virErrorPtr orig_err = virSaveLastError();
if (qemuMonitorDriveDel(priv->mon, drivestr) < 0) { if (!drivealias ||
qemuMonitorDriveDel(priv->mon, drivealias) < 0) {
VIR_WARN("Unable to remove drive %s (%s) after failed " VIR_WARN("Unable to remove drive %s (%s) after failed "
"qemuMonitorAddDevice", "qemuMonitorAddDevice",
drivestr, devstr); NULLSTR(drivealias), drivestr);
} }
if (orig_err) { if (orig_err) {
virSetError(orig_err); virSetError(orig_err);
@ -411,6 +416,7 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn,
cleanup: cleanup:
VIR_FREE(devstr); VIR_FREE(devstr);
VIR_FREE(drivestr); VIR_FREE(drivestr);
VIR_FREE(drivealias);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;