From d60b9c6b0ec77c5d458a17467f1b4939cc2f6812 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Sat, 21 Mar 2020 16:08:02 +0100
Subject: vm/vmimpl: refactor DiagnoseFree/OpenBSD

Make signatures of these functions match vm.Diagnose.
Both more flexible, less code, more reasonable.
---
 vm/gce/gce.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'vm/gce')

diff --git a/vm/gce/gce.go b/vm/gce/gce.go
index 98ab494dd..097bcd707 100644
--- a/vm/gce/gce.go
+++ b/vm/gce/gce.go
@@ -371,10 +371,10 @@ func waitForConsoleConnect(merger *vmimpl.OutputMerger) error {
 
 func (inst *instance) Diagnose() ([]byte, bool) {
 	if inst.env.OS == "freebsd" {
-		return nil, vmimpl.DiagnoseFreeBSD(inst.consolew)
+		return vmimpl.DiagnoseFreeBSD(inst.consolew)
 	}
 	if inst.env.OS == "openbsd" {
-		return nil, vmimpl.DiagnoseOpenBSD(inst.consolew)
+		return vmimpl.DiagnoseOpenBSD(inst.consolew)
 	}
 	return nil, false
 }
-- 
cgit mrf-deployment