summaryrefslogtreecommitdiff
path: root/pkg/machine
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-01-21 13:29:25 -0500
committerGitHub <noreply@github.com>2022-01-21 13:29:25 -0500
commit94703f668afc25aee3ea7341313a42322de798e6 (patch)
tree3fa41bc0e138700d9d52b8d7ca546451b7ca6bb2 /pkg/machine
parente3ea996919295213eacc41d01fdc4018cbc5edf6 (diff)
parente834297b39d415a9df3d5e56a7587e84b49e8d6c (diff)
downloadpodman-94703f668afc25aee3ea7341313a42322de798e6.tar.gz
podman-94703f668afc25aee3ea7341313a42322de798e6.tar.bz2
podman-94703f668afc25aee3ea7341313a42322de798e6.zip
Merge pull request #12959 from afbjorklund/machine-wait
Restore machine start logic that was hanging
Diffstat (limited to 'pkg/machine')
-rw-r--r--pkg/machine/qemu/machine.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index e1870f1ac..eb7b35ece 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -390,12 +390,14 @@ func (v *MachineVM) Start(name string, _ machine.StartOptions) error {
if err != nil {
return err
}
- for running || !v.isListening() {
+ listening := v.isListening()
+ for !running || !listening {
time.Sleep(100 * time.Millisecond)
running, err = v.isRunning()
if err != nil {
return err
}
+ listening = v.isListening()
}
}
for _, mount := range v.Mounts {