mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix migration to obey -S

Browse Source 
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  <glommer@redhat.com>
Cc: Anthony Liguori  <aliguori@us.ibm.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2009-07-27 23:17:51 +02:00 committed by Anthony Liguori
parent 866358211d
commit d399f67704
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migration-exec.c
View File

@ -118,6 +118,8 @@ static void exec_accept_incoming_migration(void *opaque)
dprintf("successfully loaded vm state\n"); dprintf("successfully loaded vm state\n");
/* we've successfully migrated, close the fd */ /* we've successfully migrated, close the fd */
qemu_set_fd_handler2(qemu_popen_fd(f), NULL, NULL, NULL, NULL); qemu_set_fd_handler2(qemu_popen_fd(f), NULL, NULL, NULL, NULL);
if (autostart)
vm_start();
err: err:
qemu_fclose(f); qemu_fclose(f);

2
migration-tcp.c
View File

@ -166,6 +166,8 @@ static void tcp_accept_incoming_migration(void *opaque)
/* we've successfully migrated, close the server socket */ /* we've successfully migrated, close the server socket */
qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL); qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
close(s); close(s);
if (autostart)
vm_start();
out_fopen: out_fopen:
qemu_fclose(f); qemu_fclose(f);

1
sysemu.h
View File

@ -104,6 +104,7 @@ typedef enum DisplayType
DT_NOGRAPHIC, DT_NOGRAPHIC,
} DisplayType; } DisplayType;
extern int autostart;
extern int bios_size; extern int bios_size;
extern int cirrus_vga_enabled; extern int cirrus_vga_enabled;
extern int std_vga_enabled; extern int std_vga_enabled;

4
vl.c
View File

@ -187,7 +187,7 @@ ram_addr_t ram_size;
int nb_nics; int nb_nics;
NICInfo nd_table[MAX_NICS]; NICInfo nd_table[MAX_NICS];
int vm_running; int vm_running;
static int autostart; int autostart;
static int rtc_utc = 1; static int rtc_utc = 1;
static int rtc_date_offset = -1; /* -1 means no change */ static int rtc_date_offset = -1; /* -1 means no change */
int cirrus_vga_enabled = 1; int cirrus_vga_enabled = 1;
@ -6091,7 +6091,7 @@ int main(int argc, char **argv, char **envp)
qemu_start_incoming_migration(incoming); qemu_start_incoming_migration(incoming);
} }
if (autostart) else if (autostart)
vm_start(); vm_start();
#ifndef _WIN32 #ifndef _WIN32