Avoid permanently disabled QEMU monitor when UNIX migration fails
PATCH 1/1 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 <[email protected]>
--- migration-unix.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
migration-unix.c +7 -5
@@ -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;
Signature · 1 line
1.6.5.2