mirror of
https://github.com/libvirt/libvirt.git
synced 2026-10-02 12:20:06 -05:00
qemu: hotplug: Fix error reported when cdrom tray is locked
Commit1fad65d49aused a really big hammer and overwrote the error message that might be reported by qemu if the tray is locked. Fix it by reporting the error only if no error is currently set. Error after commit mentioned above: error: internal error: timed out waiting for disk tray status update New error: error: internal error: unable to execute QEMU command 'eject': Tray of device 'drive-ide0-0-0' is not open (cherry picked from commit2e75da42e4)
This commit is contained in:
1 parent
49f05e0443
commit
2c1bff5acc
1 file changed
+6
-2
@@ -162,8 +162,12 @@ qemuHotplugWaitForTrayEject(virQEMUDriverPtr driver,
|
||||
return -1;
|
||||
|
||||
if (rc > 0) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
||||
_("timed out waiting for disk tray status update"));
|
||||
/* the caller called qemuMonitorEjectMedia which usually reports an
|
||||
* error. Report the failure in an off-chance that it didn't. */
|
||||
if (!virGetLastError()) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
||||
_("timed out waiting for disk tray status update"));
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user