diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-30 17:09:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-30 17:09:58 +0200 |
| commit | f7ad9fbd9e334b5daf9f3af9160cc8fab82255d6 (patch) | |
| tree | 8dfb5e8caf621686737abcf43d76bbb9412b5b6b /pkg/machine/qemu | |
| parent | 5e28b35aa511e699dffb2172458fda35ac01a4d2 (diff) | |
| parent | b6089a5e9967b239348afcce452c8aa82df53ccf (diff) | |
| download | podman-f7ad9fbd9e334b5daf9f3af9160cc8fab82255d6.tar.gz podman-f7ad9fbd9e334b5daf9f3af9160cc8fab82255d6.tar.bz2 podman-f7ad9fbd9e334b5daf9f3af9160cc8fab82255d6.zip | |
Merge pull request #9873 from baude/correctaarch64
resolve proper aarch64 image names
Diffstat (limited to 'pkg/machine/qemu')
| -rw-r--r-- | pkg/machine/qemu/machine.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 652a077cc..fdb528a86 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -82,7 +82,7 @@ func NewMachine(opts machine.InitOptions) (machine.VM, error) { return nil, err } vm.QMPMonitor = monitor - cmd = append(cmd, []string{"-qmp", monitor.Network + ":/" + monitor.Address + ",server,nowait"}...) + cmd = append(cmd, []string{"-qmp", monitor.Network + ":/" + monitor.Address + ",server=on,wait=off"}...) // Add network cmd = append(cmd, "-nic", "user,model=virtio,hostfwd=tcp::"+strconv.Itoa(vm.Port)+"-:22") @@ -95,7 +95,7 @@ func NewMachine(opts machine.InitOptions) (machine.VM, error) { // Add serial port for readiness cmd = append(cmd, []string{ "-device", "virtio-serial", - "-chardev", "socket,path=" + virtualSocketPath + ",server,nowait,id=" + vm.Name + "_ready", + "-chardev", "socket,path=" + virtualSocketPath + ",server=on,wait=off,id=" + vm.Name + "_ready", "-device", "virtserialport,chardev=" + vm.Name + "_ready" + ",name=org.fedoraproject.port.0"}...) vm.CmdLine = cmd return vm, nil |