Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

qemu: Report all errors on virtiofsd execution #2685

Merged
fidencio merged 1 commit into from
Jun 10, 2020
Merged

qemu: Report all errors on virtiofsd execution #2685

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions virtcontainers/qemu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,10 +641,6 @@ func (q *qemu) setupVirtiofsd() (err error) {
var listener *net.UnixListener
var fd *os.File

if _, err = os.Stat(q.config.VirtioFSDaemon); os.IsNotExist(err) {
return fmt.Errorf("virtiofsd path (%s) does not exist", q.config.VirtioFSDaemon)
}

sockPath, err := q.vhostFSSocketPath(q.id)
if err != nil {
return err
Expand Down Expand Up @@ -676,9 +672,10 @@ func (q *qemu) setupVirtiofsd() (err error) {
}

err = cmd.Start()
if err == nil {
q.state.VirtiofsdPid = cmd.Process.Pid
if err != nil {
return fmt.Errorf("virtiofs daemon %v returned with error: %v", q.config.VirtioFSDaemon, err)
}
Comment thread
fidencio marked this conversation as resolved.
q.state.VirtiofsdPid = cmd.Process.Pid
fd.Close()

// Monitor virtiofsd's stderr and stop sandbox if virtiofsd quits
Expand Down