From c53e0cc99bf794ccbb326c0dad788befad1a6c06 Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Tue, 8 Oct 2024 22:36:12 +0000 Subject: [PATCH] fix: trim control commands from qemu logs --- qemu/qemu-kernel.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu/qemu-kernel.go b/qemu/qemu-kernel.go index 037a8be..c099a42 100644 --- a/qemu/qemu-kernel.go +++ b/qemu/qemu-kernel.go @@ -396,7 +396,7 @@ func (q *System) Start() (err error) { go func() { scanner := bufio.NewScanner(q.pipe.stdout) for scanner.Scan() { - m := scanner.Text() + m := strings.TrimSpace(scanner.Text()) q.handleQemuOutput(m) q.Stdout += m + "\n" q.Log.Trace().Str("stdout", m).Msg("qemu") @@ -407,7 +407,7 @@ func (q *System) Start() (err error) { go func() { scanner := bufio.NewScanner(q.pipe.stderr) for scanner.Scan() { - m := scanner.Text() + m := strings.TrimSpace(scanner.Text()) q.handleQemuOutput(m) q.Stderr += m + "\n" q.Log.Trace().Str("stderr", m).Msg("qemu") @@ -560,7 +560,7 @@ func (q System) Command(user, cmd string) (output string, err error) { scanner := bufio.NewScanner(stdout) for scanner.Scan() { - m := scanner.Text() + m := strings.TrimSpace(scanner.Text()) q.handleCommandsOutput(m) output += m + "\n" flog.Trace().Str("stdout", m).Msg("qemu command") @@ -574,7 +574,7 @@ func (q System) Command(user, cmd string) (output string, err error) { scanner := bufio.NewScanner(stderr) for scanner.Scan() { - m := scanner.Text() + m := strings.TrimSpace(scanner.Text()) q.handleCommandsOutput(m) output += m + "\n" // Note: it prints stderr as stdout