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

Allow access to qemu log while VM is running

Browse Source
This commit is contained in:
dump_stack() 2018-10-06 12:47:09 +00:00
parent 865de3b1a9
commit 335fb038a4
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qemu/qemu-kernel.go
View File

@ -20,7 +20,7 @@ import (
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
) )
func readBytesUntilEOF(pipe io.ReadCloser) (buf []byte, err error) { func readUntilEOF(pipe io.ReadCloser, buf *[]byte) (err error) {
bufSize := 1024 bufSize := 1024
for err != io.EOF { for err != io.EOF {
stdout := make([]byte, bufSize) stdout := make([]byte, bufSize)
@ -31,7 +31,7 @@ func readBytesUntilEOF(pipe io.ReadCloser) (buf []byte, err error) {
return return
} }
buf = append(buf, stdout[:n]...) *buf = append(*buf, stdout[:n]...)
} }
if err == io.EOF { if err == io.EOF {
@ -40,12 +40,6 @@ func readBytesUntilEOF(pipe io.ReadCloser) (buf []byte, err error) {
return return
} }
func readUntilEOF(pipe io.ReadCloser) (str string, err error) {
buf, err := readBytesUntilEOF(pipe)
str = string(buf)
return
}
type arch string type arch string
const ( const (
@ -87,8 +81,9 @@ type QemuSystem struct {
stdout io.ReadCloser stdout io.ReadCloser
} }
Stdout, Stderr []byte
// accessible after qemu is closed // accessible after qemu is closed
Stdout, Stderr string
exitErr error exitErr error
} }
@ -204,9 +199,10 @@ func (q *QemuSystem) Start() (err error) {
return return
} }
go readUntilEOF(q.pipe.stdout, &q.Stdout)
go readUntilEOF(q.pipe.stderr, &q.Stderr)
go func() { go func() {
q.Stdout, _ = readUntilEOF(q.pipe.stdout)
q.Stderr, _ = readUntilEOF(q.pipe.stderr)
q.exitErr = q.cmd.Wait() q.exitErr = q.cmd.Wait()
q.Died = true q.Died = true
}() }()
@ -214,7 +210,7 @@ func (q *QemuSystem) Start() (err error) {
time.Sleep(time.Second / 10) // wait for immediately die time.Sleep(time.Second / 10) // wait for immediately die
if q.Died { if q.Died {
err = errors.New("qemu died immediately: " + q.Stderr) err = errors.New("qemu died immediately: " + string(q.Stderr))
} }
if q.Timeout != 0 { if q.Timeout != 0 {