From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 9 May 2023 07:51:40 +0000 (+0300)
Subject: qemu: Report domain name in unexpectedly closed monitor message
X-Git-Tag: v9.4.0-rc1~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30a1ceb67cb1d774c14feb3da7a8fb0c947086d2;p=thirdparty%2Flibvirt.git

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>
---

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();
         }