containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Remove `c.ExtraFiles` line in machine
This commit is contained in:
OpenShift Merge Robot 2023-09-29 06:41:02 -04:00 committed by GitHub
parent fff4e2f0ef 9b39641116
commit cc8c28eb7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/machine/applehv/machine.go
View File

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

9
pkg/machine/qemu/machine.go
View File

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