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: Fix failure path in disk hotplug

Browse Source 
Disk hotplug is a two phase action: qemuMonitorAddDrive followed by
qemuMonitorAddDevice. When the first part succeeds but the second one
fails, we need to rollback the drive addition.
This commit is contained in:
Jiri Denemark 2012-09-20 22:28:35 +02:00
parent 98be861b4d
commit 8125113cdb
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_hotplug.c
View File

@ -252,10 +252,16 @@ int qemuDomainAttachPciDiskDevice(virConnectPtr conn,
if (ret == 0) { if (ret == 0) {
ret = qemuMonitorAddDevice(priv->mon, devstr); ret = qemuMonitorAddDevice(priv->mon, devstr);
if (ret < 0) { if (ret < 0) {
VIR_WARN("qemuMonitorAddDevice failed on %s (%s)", virErrorPtr orig_err = virSaveLastError();
drivestr, devstr); if (qemuMonitorDriveDel(priv->mon, drivestr) < 0) {
/* XXX should call 'drive_del' on error but this does not VIR_WARN("Unable to remove drive %s (%s) after failed "
exist yet */ "qemuMonitorAddDevice",
drivestr, devstr);
}
if (orig_err) {
virSetError(orig_err);
virFreeError(orig_err);
}
} }
} }
} else { } else {