tools/out-of-tree
1
0
Fork 0
Code Releases Activity

Fix stderr log

Browse Source
This commit is contained in:
dump_stack() 2023-04-26 14:35:20 +00:00
parent 096cad8701
commit e04154b235
Signed by: dump_stack
GPG Key ID: BE44DA8C062D87DC
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qemu/qemu-kernel.go
View File

@ -378,7 +378,11 @@ func (q System) Command(user, cmd string) (output string, err error) {
if err != nil { if err != nil {
return return
} }
session.Stderr = session.Stdout
stderr, err := session.StderrPipe()
if err != nil {
return
}
err = session.Start(cmd) err = session.Start(cmd)
if err != nil { if err != nil {
@ -395,6 +399,17 @@ func (q System) Command(user, cmd string) (output string, err error) {
output = strings.TrimSuffix(output, "\n") output = strings.TrimSuffix(output, "\n")
}() }()
go func() {
scanner := bufio.NewScanner(stderr)
for scanner.Scan() {
m := scanner.Text()
output += m + "\n"
// Note: it prints stderr as stdout
flog.Trace().Str("stdout", m).Msg("")
}
output = strings.TrimSuffix(output, "\n")
}()
err = session.Wait() err = session.Wait()
return return
} }