qemu: Drop LFs at the end of error from QEMU log

Libvirt's error messages do not end with a LF. However, when reading the
error from QEMU log, we would read the LF from the log and keep it in
the message.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 54695c2eae0cd4d1092d6b01865de1e1dcf86b32..6b54f71baff8514b86f89782f7a6786375104d2e 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -407,6 +407,9 @@ qemuMonitorGetErrorFromLog(qemuMonitorPtr mon)
     if ((len = qemuProcessReadLog(mon->logfd, logbuf, 4096 - 1, 0, true)) <= 0)
         goto error;
 
+    while (len > 0 && logbuf[len - 1] == '\n')
+        logbuf[--len] = '\0';
+
  cleanup:
     errno = orig_errno;
     VIR_FORCE_CLOSE(mon->logfd);