mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 22:05:47 +00:00
qemu: Report domain name in unexpectedly closed monitor message
When QEMU closes the monitor suddenly, the following error message is reported: internal error: qemu unexpectedly closed the monitor: ... And this works. But other error messages produced in the same function include domain name too. Do that for the unexpectedly closed monitor message too. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
parent
25ce34998b
commit
30a1ceb67c
@ -513,15 +513,18 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED,
|
|||||||
|
|
||||||
if (error || mon->goteof) {
|
if (error || mon->goteof) {
|
||||||
if (hangup && mon->logFunc != NULL) {
|
if (hangup && mon->logFunc != NULL) {
|
||||||
|
g_autofree char *errmsg = NULL;
|
||||||
|
|
||||||
/* Check if an error message from qemu is available and if so, use
|
/* Check if an error message from qemu is available and if so, use
|
||||||
* it to overwrite the actual message. It's done only in early
|
* it to overwrite the actual message. It's done only in early
|
||||||
* startup phases or during incoming migration when the message
|
* startup phases or during incoming migration when the message
|
||||||
* from qemu is certainly more interesting than a
|
* from qemu is certainly more interesting than a
|
||||||
* "connection reset by peer" message.
|
* "connection reset by peer" message.
|
||||||
*/
|
*/
|
||||||
mon->logFunc(mon,
|
|
||||||
_("qemu unexpectedly closed the monitor"),
|
errmsg = g_strdup_printf(_("QEMU unexpectedly closed the monitor (vm='%1$s')"),
|
||||||
mon->logOpaque);
|
mon->domainName);
|
||||||
|
mon->logFunc(mon, errmsg, mon->logOpaque);
|
||||||
virCopyLastError(&mon->lastError);
|
virCopyLastError(&mon->lastError);
|
||||||
virResetLastError();
|
virResetLastError();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user