From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 2 Aug 2023 07:25:22 +0000 (+0200)
Subject: virLXCProcessReportStartupLogError: Strip trailing newline from error
X-Git-Tag: v9.7.0-rc1~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b63b64ad91f51e42db2fb903fc79f3a0cf6d5db;p=thirdparty%2Flibvirt.git

virLXCProcessReportStartupLogError: Strip trailing newline from error

Since the error message originates from a log file it contains a
trailing newline. Strip it as all error handling adds it's own newline.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 6b79bd737b..04642b56dd 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -1124,6 +1124,7 @@ virLXCProcessReportStartupLogError(virDomainObj *vm,
 {
     size_t buflen = 1024;
     g_autofree char *errbuf = g_new0(char, buflen);
+    char *p;
     int rc;
 
     if ((rc = virLXCProcessReadLogOutput(vm, logfile, pos, errbuf, buflen)) < 0)
@@ -1132,6 +1133,11 @@ virLXCProcessReportStartupLogError(virDomainObj *vm,
     if (rc == 0)
         return 0;
 
+    /* strip last newline */
+    if ((p = strrchr(errbuf, '\n')) &&
+        p[1] == '\0')
+        *p = '\0';
+
     virReportError(VIR_ERR_INTERNAL_ERROR,
                    _("guest failed to start: %1$s"), errbuf);