External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-05 01:22:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

virLXCProcessReportStartupLogError: Strip trailing newline from error

Browse Source 
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>
This commit is contained in:
Peter Krempa 2023-08-02 09:25:22 +02:00
parent 1f8558cf9a
commit 2b63b64ad9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/lxc_process.c
View File

@ -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);