External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: hotplug: Adjust error path for attach hostdev scsi disk

Browse Source 
Adjust error path logic to make it clearer how to undo the failed add.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2016-04-11 13:32:12 -04:00
parent 843ae77896
commit 3e81b98ceb
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/qemu/qemu_hotplug.c
View File

@ -1882,6 +1882,7 @@ qemuDomainAttachHostSCSIDevice(virConnectPtr conn,
{ {
int ret = -1; int ret = -1;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virErrorPtr orig_err;
virDomainControllerDefPtr cont = NULL; virDomainControllerDefPtr cont = NULL;
char *devstr = NULL; char *devstr = NULL;
char *drvstr = NULL; char *drvstr = NULL;
@ -1941,32 +1942,24 @@ qemuDomainAttachHostSCSIDevice(virConnectPtr conn,
if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0)
goto cleanup; goto cleanup;
/* Attach the device - 2 step process */
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
if ((ret = qemuMonitorAddDrive(priv->mon, drvstr)) == 0) {
if ((ret = qemuMonitorAddDevice(priv->mon, devstr)) < 0) {
virErrorPtr orig_err = virSaveLastError();
if (qemuMonitorDriveDel(priv->mon, drvstr) < 0)
VIR_WARN("Unable to remove drive %s (%s) after failed "
"qemuMonitorAddDevice",
drvstr, devstr);
if (orig_err) {
virSetError(orig_err);
virFreeError(orig_err);
}
}
}
if (qemuDomainObjExitMonitor(driver, vm) < 0) {
ret = -1;
goto cleanup;
}
virDomainAuditHostdev(vm, hostdev, "attach", ret == 0); if (qemuMonitorAddDrive(priv->mon, drvstr) < 0)
if (ret < 0) goto failadddrive;
goto cleanup;
if (qemuMonitorAddDevice(priv->mon, devstr) < 0)
goto failadddevice;
if (qemuDomainObjExitMonitor(driver, vm) < 0)
goto failexitmonitor;
virDomainAuditHostdev(vm, hostdev, "attach", true);
vm->def->hostdevs[vm->def->nhostdevs++] = hostdev; vm->def->hostdevs[vm->def->nhostdevs++] = hostdev;
ret = 0; ret = 0;
cleanup: cleanup:
qemuDomainSecretHostdevDestroy(hostdev); qemuDomainSecretHostdevDestroy(hostdev);
if (ret < 0) { if (ret < 0) {
@ -1981,6 +1974,25 @@ qemuDomainAttachHostSCSIDevice(virConnectPtr conn,
VIR_FREE(drvstr); VIR_FREE(drvstr);
VIR_FREE(devstr); VIR_FREE(devstr);
return ret; return ret;
failadddevice:
orig_err = virSaveLastError();
if (qemuMonitorDriveDel(priv->mon, drvstr) < 0)
VIR_WARN("Unable to remove drive %s (%s) after failed "
"qemuMonitorAddDevice",
drvstr, devstr);
if (orig_err) {
virSetError(orig_err);
virFreeError(orig_err);
}
failadddrive:
ignore_value(qemuDomainObjExitMonitor(driver, vm));
failexitmonitor:
virDomainAuditHostdev(vm, hostdev, "attach", false);
goto cleanup;
} }