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

Merge pull request #13620 from Luap99/qemu-path 

podman machine start: lookup qemu path again if not found
This commit is contained in:
OpenShift Merge Robot 2022-03-24 18:11:45 +01:00 committed by GitHub
parent caaaf07c1e da58911306
commit c61b06c46c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,7 +98,7 @@ func (p *Provider) NewMachine(opts machine.InitOptions) (machine.VM, error) {
return nil, err return nil, err
} }
cmd := append([]string{execPath}) cmd := []string{execPath}
// Add memory // Add memory
cmd = append(cmd, []string{"-m", strconv.Itoa(int(vm.Memory))}...) cmd = append(cmd, []string{"-m", strconv.Itoa(int(vm.Memory))}...)
// Add cpus // Add cpus
@ -430,13 +430,29 @@ func (v *MachineVM) Start(name string, _ machine.StartOptions) error {
// Disable graphic window when not in debug mode // Disable graphic window when not in debug mode
// Done in start, so we're not suck with the debug level we used on init // Done in start, so we're not suck with the debug level we used on init
if logrus.GetLevel() != logrus.DebugLevel { if !logrus.IsLevelEnabled(logrus.DebugLevel) {
cmd = append(cmd, "-display", "none") cmd = append(cmd, "-display", "none")
} }
_, err = os.StartProcess(v.CmdLine[0], cmd, attr) _, err = os.StartProcess(v.CmdLine[0], cmd, attr)
if err != nil { if err != nil {
return err // check if qemu was not found
if !errors.Is(err, os.ErrNotExist) {
return err
}
// lookup qemu again maybe the path was changed, https://github.com/containers/podman/issues/13394
cfg, err := config.Default()
if err != nil {
return err
}
cmd[0], err = cfg.FindHelperBinary(QemuCommand, true)
if err != nil {
return err
}
_, err = os.StartProcess(cmd[0], cmd, attr)
if err != nil {
return err
}
} }
fmt.Println("Waiting for VM ...") fmt.Println("Waiting for VM ...")
socketPath, err := getRuntimeDir() socketPath, err := getRuntimeDir()