From 511c0231033eb8fbdf2a615b429e1bc6b5aad52c Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 9 Jun 2010 14:10:55 +0200 Subject: Factorize common migration incoming code Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- migration-unix.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'migration-unix.c') diff --git a/migration-unix.c b/migration-unix.c index 49de1b9e84..57232c07a9 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -149,7 +149,7 @@ static void unix_accept_incoming_migration(void *opaque) socklen_t addrlen = sizeof(addr); int s = (unsigned long)opaque; QEMUFile *f; - int c, ret; + int c; do { c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen); @@ -168,18 +168,7 @@ static void unix_accept_incoming_migration(void *opaque) goto out; } - ret = qemu_loadvm_state(f); - if (ret < 0) { - fprintf(stderr, "load of migration failed\n"); - goto out_fopen; - } - qemu_announce_self(); - DPRINTF("successfully loaded vm state\n"); - - if (autostart) - vm_start(); - -out_fopen: + process_incoming_migration(f); qemu_fclose(f); out: qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL); -- cgit v1.2.1