From 0c1b8ea6ca74d3687286ed0172e7418340efdb6e Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 13 Sep 2022 15:03:49 -0700 Subject: [PATCH] if socket network with, start with socket_vmnet --- pkg/drivers/qemu/qemu.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 47f49a6aad..1e89de8e0c 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -445,13 +445,19 @@ func (d *Driver) Start() error { d.diskPath()) } - socketCmd := append([]string{"/var/run/socket_vmnet", d.Program}, startCmd...) - fmt.Printf("socketCmd: %v\n", socketCmd) - if stdout, stderr, err := cmdOutErr("/opt/socket_vmnet/bin/socket_vmnet_client", socketCmd...); err != nil { + // If socket network, start with socket_vmnet. + startProgram := d.Program + if d.Network == "socket" { + startProgram = "/opt/socket_vmnet/bin/socket_vmnet_client" // get flag. + startCmd = append([]string{"/var/run/socket_vmnet", d.Program}, startCmd...) // get flag. + } + + if stdout, stderr, err := cmdOutErr(startProgram, startCmd...); err != nil { fmt.Printf("OUTPUT: %s\n", stdout) fmt.Printf("ERROR: %s\n", stderr) return err } + log.Infof("Waiting for VM to start (ssh -p %d docker@localhost)...", d.SSHPort) return WaitForTCPWithDelay(fmt.Sprintf("localhost:%d", d.SSHPort), time.Second)