External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: hotplug: Properly handle errors in qemuDomainWaitForDeviceRemoval

Browse Source 
Callers ignore if this function returns -1 and continue as though the
DEVICE_DELETED event was not received. Since we can't be sure that the
event was not received we should behave as if the event was not
supported and remove the device definition right away. The error
fortunately won't really happen here.
This commit is contained in:
Peter Krempa 2016-04-04 15:27:25 +02:00
parent 786bc2511a
commit 65b390ad1b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_hotplug.c
View File

@ -3348,8 +3348,8 @@ qemuDomainResetDeviceRemoval(virDomainObjPtr vm)
}
/* Returns:
* -1 on error
* 0 when DEVICE_DELETED event is unsupported
* 0 when DEVICE_DELETED event is unsupported, or we failed to reliably wait
* for the event
* 1 when DEVICE_DELETED arrived before the timeout and the caller is
* responsible for finishing the removal
* 2 device removal did not finish in qemuDomainRemoveDeviceWaitTime
@ -3364,7 +3364,7 @@ qemuDomainWaitForDeviceRemoval(virDomainObjPtr vm)
return 0;
if (virTimeMillisNow(&until) < 0)
return -1;
return 0;
until += qemuDomainRemoveDeviceWaitTime;
while (priv->unpluggingDevice) {
@ -3373,9 +3373,9 @@ qemuDomainWaitForDeviceRemoval(virDomainObjPtr vm)
if (errno == ETIMEDOUT) {
return 2;
} else {
virReportSystemError(errno, "%s",
_("Unable to wait on unplug condition"));
return -1;
VIR_WARN("Failed to wait on unplug condition for domain '%s' "
"device '%s'", vm->def->name, priv->unpluggingDevice);
return 0;
}
}
}