diff options
author | Daniel P. Berrange <berrange@redhat.com> | 2009-12-11 21:01:14 +0000 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-18 11:26:26 -0600 |
commit | 2dd650e58acbafedc7bf34045b7f81bb6c912e72 (patch) | |
tree | fd86ef39523287296ca4adc82d48d5a8d264ca15 /migration-unix.c | |
parent | 092493be3caab1ac77f4223b4c3fb0975d1ed490 (diff) | |
download | hqemu-2dd650e58acbafedc7bf34045b7f81bb6c912e72.zip hqemu-2dd650e58acbafedc7bf34045b7f81bb6c912e72.tar.gz |
Avoid permanently disabled QEMU monitor when UNIX migration fails
If a UNIX migration command is attempt to a UNIX socket which does
not exist, then the monitor is suspended, but never resumed. This
prevents any further use of the monitor
* migration-unix.c: Only call migrate_fd_monitor_suspend() once
connected to the UNIX socket.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'migration-unix.c')
-rw-r--r-- | migration-unix.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/migration-unix.c b/migration-unix.c index 783228b..a141dbb 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -112,10 +112,6 @@ MigrationState *unix_start_outgoing_migration(Monitor *mon, socket_set_nonblock(s->fd); - if (!detach) { - migrate_fd_monitor_suspend(s, mon); - } - do { ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)); if (ret == -1) @@ -128,7 +124,13 @@ MigrationState *unix_start_outgoing_migration(Monitor *mon, if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK) { dprintf("connect failed\n"); goto err_after_open; - } else if (ret >= 0) + } + + if (!detach) { + migrate_fd_monitor_suspend(s, mon); + } + + if (ret >= 0) migrate_fd_connect(s); return &s->mig_state; |