vm: support console_cmd to run cmd to collect console log

- Sometimes we need customized cmd to get serial log, ex FTDI4232H
chip gets serial log through usb directly, thus we need to call
cmd like `pyterm.py ftdi://ftdi:4232:FT7JLD0U/1`.
- There are seveval places in console implementation to call
osutil.Command, move the command code into one function.

1 files changed, 23 insertions, 29 deletions

diff --git a/vm/vmimpl/console.go b/vm/vmimpl/console.go
index 200c44f73..7ae680f26 100644
--- a/vm/vmimpl/console.go
+++ b/vm/vmimpl/console.go
@@ -77,46 +77,45 @@ func (t *tty) Close() error {
 // OpenRemoteKernelLog accesses to the host where Android VM runs on, not Android VM itself.
 // The host stores all kernel outputs of Android VM so in case of crashes nothing will be lost.
 func OpenRemoteKernelLog(ip, console string) (rc io.ReadCloser, err error) {
-	rpipe, wpipe, err := osutil.LongPipe()
-	if err != nil {
-		return nil, err
-	}
 	conAddr := "vsoc-01@" + ip
-	cmd := osutil.Command("ssh", conAddr, "tail", "-f", console)
-	cmd.Stdout = wpipe
-	cmd.Stderr = wpipe
-	if _, err := cmd.StdinPipe(); err != nil {
-		rpipe.Close()
-		wpipe.Close()
-		return nil, err
-	}
-	if err := cmd.Start(); err != nil {
-		rpipe.Close()
-		wpipe.Close()
-		return nil, fmt.Errorf("failed to connect to console server: %w", err)
-	}
-	wpipe.Close()
-	con := &remoteCon{
-		cmd:   cmd,
-		rpipe: rpipe,
+	args := []string{
+		conAddr,
+		"tail",
+		"-f",
+		console,
 	}
-	return con, nil
+	return OpenConsoleByCmd("ssh", args)
 }
 
 // Open dmesg remotely.
 func OpenRemoteConsole(bin string, args ...string) (rc io.ReadCloser, err error) {
+	args = append(args, "dmesg -w")
+	return OpenConsoleByCmd(bin, args)
+}
+
+// OpenAdbConsole provides fallback console output using 'adb shell dmesg -w'.
+func OpenAdbConsole(bin, dev string) (rc io.ReadCloser, err error) {
+	return OpenRemoteConsole(bin, "-s", dev, "shell")
+}
+
+// Open console log by cmd.
+func OpenConsoleByCmd(bin string, args []string) (rc io.ReadCloser, err error) {
 	rpipe, wpipe, err := osutil.LongPipe()
 	if err != nil {
 		return nil, err
 	}
-	args = append(args, "dmesg -w")
 	cmd := osutil.Command(bin, args...)
 	cmd.Stdout = wpipe
 	cmd.Stderr = wpipe
+	if _, err := cmd.StdinPipe(); err != nil {
+		rpipe.Close()
+		wpipe.Close()
+		return nil, err
+	}
 	if err := cmd.Start(); err != nil {
 		rpipe.Close()
 		wpipe.Close()
-		return nil, fmt.Errorf("failed to start adb: %w", err)
+		return nil, fmt.Errorf("failed to open console: %w", err)
 	}
 	wpipe.Close()
 	con := &remoteCon{
@@ -126,11 +125,6 @@ func OpenRemoteConsole(bin string, args ...string) (rc io.ReadCloser, err error)
 	return con, err
 }
 
-// OpenAdbConsole provides fallback console output using 'adb shell dmesg -w'.
-func OpenAdbConsole(bin, dev string) (rc io.ReadCloser, err error) {
-	return OpenRemoteConsole(bin, "-s", dev, "shell")
-}
-
 type remoteCon struct {
 	closeMu sync.Mutex
 	readMu  sync.Mutex