diff options
author | Michal Privoznik <mprivozn@redhat.com> | 2023-05-09 10:51:40 +0300 |
---|---|---|
committer | Michal Privoznik <mprivozn@redhat.com> | 2023-05-09 14:57:28 +0300 |
commit | 30a1ceb67cb1d774c14feb3da7a8fb0c947086d2 (patch) | |
tree | fa250da8426a77fef896ce5daea4af38893df038 | |
parent | 25ce34998ba713e2d0167315cb178cdebb02e7c8 (diff) | |
download | libvirt-30a1ceb67cb1d774c14feb3da7a8fb0c947086d2.tar.gz |
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>
-rw-r--r-- | src/qemu/qemu_monitor.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 71ebd356ad..dacf161971 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -513,15 +513,18 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, if (error || mon->goteof) { if (hangup && mon->logFunc != NULL) { + g_autofree char *errmsg = NULL; + /* 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 * startup phases or during incoming migration when the message * from qemu is certainly more interesting than a * "connection reset by peer" message. */ - mon->logFunc(mon, - _("qemu unexpectedly closed the monitor"), - mon->logOpaque); + + errmsg = g_strdup_printf(_("QEMU unexpectedly closed the monitor (vm='%1$s')"), + mon->domainName); + mon->logFunc(mon, errmsg, mon->logOpaque); virCopyLastError(&mon->lastError); virResetLastError(); } |