From 39302300d91e4875a2e2f475bb7938dfc86a5e20 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 3 May 2018 14:01:48 +0200 Subject: gometalinter: check unkeyed composite literals Update #538 --- vm/gce/gce.go | 2 +- vm/qemu/qemu.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'vm') diff --git a/vm/gce/gce.go b/vm/gce/gce.go index bdb7911f8..782712c4a 100644 --- a/vm/gce/gce.go +++ b/vm/gce/gce.go @@ -367,7 +367,7 @@ func (pool *Pool) waitInstanceBoot(name, ip, sshKey, sshUser, gceKey string) err if err != nil { output = []byte(fmt.Sprintf("failed to get boot output: %v", err)) } - return vmimpl.BootError{"can't ssh into the instance", output} + return vmimpl.BootError{Title: "can't ssh into the instance", Output: output} } func (pool *Pool) getSerialPortOutput(name, gceKey string) ([]byte, error) { diff --git a/vm/qemu/qemu.go b/vm/qemu/qemu.go index 9e27bd40c..b44f4198c 100644 --- a/vm/qemu/qemu.go +++ b/vm/qemu/qemu.go @@ -370,13 +370,13 @@ func (inst *instance) Boot() error { time.Sleep(time.Second) // wait for any pending output bootOutputStop <- true <-bootOutputStop - return vmimpl.BootError{"qemu stopped", bootOutput} + return vmimpl.BootError{Title: "qemu stopped", Output: bootOutput} default: } if time.Since(start) > 10*time.Minute { bootOutputStop <- true <-bootOutputStop - return vmimpl.BootError{"ssh server did not start", bootOutput} + return vmimpl.BootError{Title: "ssh server did not start", Output: bootOutput} } } bootOutputStop <- true -- cgit mrf-deployment