Skip to content

Commit

Permalink
applehv: Remove unneeded cmd.ExtraFiles assignment
Browse files Browse the repository at this point in the history
`applehv.Start()` has this line of code:
```
cmd.ExtraFiles = []*os.File{ioEater, ioEater, ioEater}
```
whose purpose is not clear.

The intent may have been to redirect stdin/stdout/stderr to /dev/null in
the child process.
This should be done by setting cmd.Stdin/cmd.Stdout/cmd/Stderr to nil,
which is the case by default.

The way it's done could also cause issues as
`Vfkit.VirtualMachine.Cmd()` sometimes adds files it needs to keep open
to `ExtraFiles`, so at the very least this should be an `append()`

This commit removes this code.

[NO NEW TESTS NEEDED]

Signed-off-by: Christophe Fergeau <[email protected]>
  • Loading branch information
cfergeau committed Jan 16, 2024
1 parent 9fed92b commit 90f6989
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions pkg/machine/applehv/machine.go
Original file line number Diff line number Diff line change
Expand Up @@ -572,12 +572,6 @@ func (m *MacMachine) Start(name string, opts machine.StartOptions) error {
return machine.ErrVMAlreadyRunning
}

ioEater, err := os.OpenFile(os.DevNull, os.O_WRONLY, 0755)
if err != nil {
return err
}
defer ioEater.Close()

// TODO handle returns from startHostNetworking
forwardSock, forwardState, err := m.startHostNetworking()
if err != nil {
Expand Down Expand Up @@ -641,8 +635,6 @@ func (m *MacMachine) Start(name string, opts machine.StartOptions) error {
cmd.Args = append(cmd.Args, "--gui") // add command line switch to pop the gui open
}

cmd.ExtraFiles = []*os.File{ioEater, ioEater, ioEater}

readSocketBaseDir := filepath.Dir(m.ReadySocket.GetPath())
if err := os.MkdirAll(readSocketBaseDir, 0755); err != nil {
return err
Expand Down

0 comments on commit 90f6989

Please sign in to comment.