Merge pull request #20198 from jakecorrenti/remove-extra-files-line

Remove `c.ExtraFiles` line in machine
containers · Sep 29, 2023 · cc8c28e · cc8c28e
2 parents fff4e2f + 9b39641
commit cc8c28e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/pkg/machine/applehv/machine.go b/pkg/machine/applehv/machine.go
@@ -543,7 +543,7 @@ func (m *MacMachine) Start(name string, opts machine.StartOptions) error {
 	defer ioEater.Close()
 
 	// TODO handle returns from startHostNetworking
-	forwardSock, forwardState, err := m.startHostNetworking(ioEater)
+	forwardSock, forwardState, err := m.startHostNetworking()
 	if err != nil {
 		return err
 	}
@@ -816,7 +816,7 @@ func (m *MacMachine) setupStartHostNetworkingCmd() (gvproxy.GvproxyCommand, stri
 	return cmd, forwardSock, state
 }
 
-func (m *MacMachine) startHostNetworking(ioEater *os.File) (string, machine.APIForwardingState, error) {
+func (m *MacMachine) startHostNetworking() (string, machine.APIForwardingState, error) {
 	var (
 		forwardSock string
 		state       machine.APIForwardingState
@@ -858,7 +858,6 @@ func (m *MacMachine) startHostNetworking(ioEater *os.File) (string, machine.APIF
 
 	cmd, forwardSock, state := m.setupStartHostNetworkingCmd()
 	c := cmd.Cmd(gvproxyBinary)
-	c.ExtraFiles = []*os.File{ioEater, ioEater, ioEater}
 	if err := c.Start(); err != nil {
 		return "", 0, fmt.Errorf("unable to execute: %q: %w", cmd.ToCmdline(), err)
 	}

diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
@@ -1317,14 +1317,6 @@ func (v *MachineVM) startHostNetworking() (string, machine.APIForwardingState, e
 		return "", machine.NoForwarding, err
 	}
 
-	dnr, dnw, err := machine.GetDevNullFiles()
-	if err != nil {
-		return "", machine.NoForwarding, err
-	}
-
-	defer dnr.Close()
-	defer dnw.Close()
-
 	cmd := gvproxy.NewGvproxyCommand()
 	cmd.AddQemuSocket(fmt.Sprintf("unix://%s", v.QMPMonitor.Address.GetPath()))
 	cmd.PidFile = v.PidFilePath.GetPath()
@@ -1342,7 +1334,6 @@ func (v *MachineVM) startHostNetworking() (string, machine.APIForwardingState, e
 	}
 
 	c := cmd.Cmd(binary)
-	c.ExtraFiles = []*os.File{dnr, dnw, dnw}
 	if err := c.Start(); err != nil {
 		return "", 0, fmt.Errorf("unable to execute: %q: %w", cmd.ToCmdline(), err)
 	}