External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 07:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Properly report a startup timeout error

Browse Source 
The timeout errors were unconditionally being overwritten by the less
helpful 'unable to start guest' error.
This commit is contained in:
Cole Robinson 2010-02-09 14:45:35 -05:00
parent 80de0a8c40
commit b65490a312
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/qemu/qemu_driver.c
View File

@ -1351,15 +1351,15 @@ qemudReadLogOutput(virDomainObjPtr vm,
buf[got] = '\0';
if (got == buflen-1) {
qemuReportError(VIR_ERR_INTERNAL_ERROR,
_("Out of space while reading %s log output"),
what);
_("Out of space while reading %s log output: %s"),
what, buf);
return -1;
}
if (isdead) {
qemuReportError(VIR_ERR_INTERNAL_ERROR,
_("Process exited while reading %s log output"),
what);
_("Process exited while reading %s log output: %s"),
what, buf);
return -1;
}
@ -1371,7 +1371,8 @@ qemudReadLogOutput(virDomainObjPtr vm,
}
qemuReportError(VIR_ERR_INTERNAL_ERROR,
_("Timed out while reading %s log output"), what);
_("Timed out while reading %s log output: %s"),
what, buf);
return -1;
}
@ -1547,12 +1548,8 @@ qemudWaitForMonitor(struct qemud_driver* driver,
virStrerror(errno, ebuf, sizeof ebuf));
}
if (ret < 0) {
/* Unexpected end of file - inform user of QEMU log data */
qemuReportError(VIR_ERR_INTERNAL_ERROR,
_("unable to start guest: %s"), buf);
if (ret < 0)
return -1;
}
VIR_DEBUG("Connect monitor to %p '%s'", vm, vm->def->name);
if (qemuConnectMonitor(vm) < 0)