[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/12] fix migration to obey -S
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 06/12] fix migration to obey -S |
Date: |
Wed, 26 Aug 2009 09:05:40 -0400 |
From: Paolo Bonzini <address@hidden>
Since migration returns right away, starting the VM right
after calling qemu_start_incoming_migration is wrong even
if -S is not passed. We have to do this after migration
has completed.
Cc: Glauber Costa <address@hidden>
Cc: Anthony Liguori <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Signed-off-by: Glauber Costa <address@hidden>
---
migration-exec.c | 2 ++
migration-tcp.c | 2 ++
sysemu.h | 1 +
vl.c | 4 ++--
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/migration-exec.c b/migration-exec.c
index 2e7fdc2..ade592e 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -122,6 +122,8 @@ static void exec_accept_incoming_migration(void *opaque)
dprintf("successfully loaded vm state\n");
/* we've successfully migrated, close the fd */
qemu_set_fd_handler2(qemu_popen_fd(f), NULL, NULL, NULL, NULL);
+ if (autostart)
+ vm_start();
err:
qemu_fclose(f);
diff --git a/migration-tcp.c b/migration-tcp.c
index 0875c23..5466e57 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -170,6 +170,8 @@ static void tcp_accept_incoming_migration(void *opaque)
/* we've successfully migrated, close the server socket */
qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
close(s);
+ if (autostart)
+ vm_start();
out_fopen:
qemu_fclose(f);
diff --git a/sysemu.h b/sysemu.h
index 57217c1..f549f29 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -77,6 +77,7 @@ int tap_win32_init(VLANState *vlan, const char *model,
/* SLIRP */
void do_info_slirp(void);
+extern int autostart;
extern int bios_size;
extern int cirrus_vga_enabled;
extern int std_vga_enabled;
diff --git a/vl.c b/vl.c
index 0e46727..f1244c9 100644
--- a/vl.c
+++ b/vl.c
@@ -201,7 +201,7 @@ ram_addr_t ram_size;
int nb_nics;
NICInfo nd_table[MAX_NICS];
int vm_running;
-static int autostart;
+int autostart;
static int rtc_utc = 1;
static int rtc_date_offset = -1; /* -1 means no change */
int cirrus_vga_enabled = 1;
@@ -5726,7 +5726,7 @@ int main(int argc, char **argv, char **envp)
qemu_start_incoming_migration(incoming);
}
- if (autostart)
+ else if (autostart)
vm_start();
if (daemonize) {
--
1.6.2.2
- [Qemu-devel] [GIT PULL] 0.10.7 stable release, Glauber Costa, 2009/08/26
- [Qemu-devel] [PATCH 01/12] fix for bad macaddr of e1000 in Windows 2003 server with original MS driver, Glauber Costa, 2009/08/26
- [Qemu-devel] [PATCH 02/12] Handle BH's queued by AIO completions in qemu_aio_flush(), Glauber Costa, 2009/08/26
- [Qemu-devel] [PATCH 03/12] BACKPORT: Add save/restore support to the LSI logic SCSI device model., Glauber Costa, 2009/08/26
- [Qemu-devel] [PATCH 04/12] vmdk: Fix backing file handling, Glauber Costa, 2009/08/26
- [Qemu-devel] [PATCH 05/12] fix broken migration, Glauber Costa, 2009/08/26
- [Qemu-devel] [PATCH 06/12] fix migration to obey -S,
Glauber Costa <=
- [Qemu-devel] [PATCH 07/12] BACKPORT: vnc: fix copyrect screen corruption, Glauber Costa, 2009/08/26
- [Qemu-devel] [PATCH 08/12] e1000.c doesn't properly emulate EERD and ICS registers, Glauber Costa, 2009/08/26
- [Qemu-devel] [PATCH 09/12] make windows notice media change, Glauber Costa, 2009/08/26
- [Qemu-devel] [PATCH 10/12] BACKPORT: Fix segfault of qemu-system-arm with PXA target, Glauber Costa, 2009/08/26
- [Qemu-devel] [PATCH 11/12] Fix detached migration with exec., Glauber Costa, 2009/08/26
- [Qemu-devel] [PATCH 12/12] Don't segfault when changing VNC password on an SDL display., Glauber Costa, 2009/08/26
- [Qemu-devel] Re: [PATCH 11/12] Fix detached migration with exec., Chris Lalancette, 2009/08/27
- [Qemu-devel] Re: [PATCH 05/12] fix broken migration, Paolo Bonzini, 2009/08/26
- Message not available
- [Qemu-devel] Re: [PATCH 05/12] fix broken migration, Glauber Costa, 2009/08/27
- [Qemu-devel] Re: [PATCH 05/12] fix broken migration, Paolo Bonzini, 2009/08/28