OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Fix brown-paper-bag bugs from live-migration patch (Charles Duffy)

Browse Source 
In TCP migration, prevent an endless loop trying to retrieve error status. In
exec migration, set the close pointer in the FdMigrationState structure.

Color me embarrassed.

Signed-off-by: Charles Duffy <charles_duffy@messageone.com> 
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5713 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2008-11-12 22:29:11 +00:00
parent c310de8657
commit 8ad9fa5d8b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
migration-exec.c
View File

@ -85,6 +85,7 @@ MigrationState *exec_start_outgoing_migration(const char *command,
s->opaque = qemu_popen(f, "w"); s->opaque = qemu_popen(f, "w");
s->close = exec_close;
s->get_error = file_errno; s->get_error = file_errno;
s->write = file_write; s->write = file_write;
s->mig_state.cancel = migrate_fd_cancel; s->mig_state.cancel = migrate_fd_cancel;

2
migration-tcp.c
View File

@ -32,7 +32,7 @@
static int socket_errno(FdMigrationState *s) static int socket_errno(FdMigrationState *s)
{ {
return (s->get_error(s)); return socket_error();
} }
static int socket_write(FdMigrationState *s, const void * buf, size_t size) static int socket_write(FdMigrationState *s, const void * buf, size_t size)