falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
(cherry picked from commit 2dd650e58a)
This commit is contained in:
Daniel P. Berrange 2009-12-11 21:01:14 +00:00 committed by Anthony Liguori
parent 139e310025
commit 55ed56908f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migration-unix.c
View File

@ -112,10 +112,6 @@ MigrationState *unix_start_outgoing_migration(Monitor *mon,
socket_set_nonblock(s->fd); socket_set_nonblock(s->fd);
if (!detach) {
migrate_fd_monitor_suspend(s, mon);
}
do { do {
ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)); ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr));
if (ret == -1) if (ret == -1)
@ -128,7 +124,13 @@ MigrationState *unix_start_outgoing_migration(Monitor *mon,
if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK) { if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK) {
dprintf("connect failed\n"); dprintf("connect failed\n");
goto err_after_open; goto err_after_open;
} else if (ret >= 0) }
if (!detach) {
migrate_fd_monitor_suspend(s, mon);
}
if (ret >= 0)
migrate_fd_connect(s); migrate_fd_connect(s);
return &s->mig_state; return &s->mig_state;