github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-19 18:01:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2055 from lifupan/fix_missingqemulog

Browse Source 
virtcontainers: fix the issue of missing qemu error logs
This commit is contained in:
Julio Montes 2019-09-20 07:41:47 -05:00 committed by GitHub
commit 948dd3303a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
virtcontainers/qemu.go
View File

@ -763,7 +763,15 @@ func (q *qemu) startSandbox(timeout int) error {
var strErr string var strErr string
strErr, err = govmmQemu.LaunchQemu(q.qemuConfig, newQMPLogger()) strErr, err = govmmQemu.LaunchQemu(q.qemuConfig, newQMPLogger())
if err != nil { if err != nil {
return fmt.Errorf("fail to launch qemu: %s, error messages from qemu log: %s", err, strErr) if q.config.Debug && q.qemuConfig.LogFile != "" {
b, err := ioutil.ReadFile(q.qemuConfig.LogFile)
if err == nil {
strErr += string(b)
}
}
q.Logger().WithError(err).Errorf("failed to launch qemu: %s", strErr)
return fmt.Errorf("failed to launch qemu: %s, error messages from qemu log: %s", err, strErr)
} }
err = q.waitSandbox(timeout) // the virtiofsd deferred checks err's value err = q.waitSandbox(timeout) // the virtiofsd deferred checks err's value