diff options
| author | Andrei Vagin <avagin@google.com> | 2020-03-03 11:32:55 -0800 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-03-04 11:13:09 +0100 |
| commit | 712198accc88c528b4460e661a93712ae53f16da (patch) | |
| tree | 3ee3f1f3bb426dcdad820761539a07fbe60f29bd /vm/gvisor | |
| parent | f60dc5d243852d5d9767e4c2a8641f4ba8756335 (diff) | |
gvisor: code cleanups
* use RunCmd instead of osutil.Run.
* remove unneeded type casting from string to []byte.
Signed-off-by: Andrei Vagin <avagin@google.com>
Diffstat (limited to 'vm/gvisor')
| -rw-r--r-- | vm/gvisor/gvisor.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vm/gvisor/gvisor.go b/vm/gvisor/gvisor.go index e6b970587..5ba4bccf1 100644 --- a/vm/gvisor/gvisor.go +++ b/vm/gvisor/gvisor.go @@ -353,13 +353,13 @@ func (inst *instance) guestProxy() (*os.File, error) { func (inst *instance) Diagnose() ([]byte, bool) { b, err := osutil.Run(time.Minute, inst.runscCmd("debug", "-stacks", "--ps", inst.name)) if err != nil { - b = append(b, []byte(fmt.Sprintf("\n\nError collecting stacks: %v", err))...) + b = append(b, fmt.Sprintf("\n\nError collecting stacks: %v", err)...) } - b1, err := osutil.Run(time.Minute, osutil.Command("dmesg")) + b1, err := osutil.RunCmd(time.Minute, "", "dmesg") + b = append(b, b1...) if err != nil { - b = append(b, []byte(fmt.Sprintf("\n\nError collecting kernel logs: %v", err))...) + b = append(b, fmt.Sprintf("\n\nError collecting kernel logs: %v", err)...) } - b = append(b, b1...) return b, false } |