mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
fix migration to obey -S
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:
parent
866358211d
commit
d399f67704
|
@ -118,6 +118,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);
|
||||
|
|
|
@ -166,6 +166,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);
|
||||
|
|
1
sysemu.h
1
sysemu.h
|
@ -104,6 +104,7 @@ typedef enum DisplayType
|
|||
DT_NOGRAPHIC,
|
||||
} DisplayType;
|
||||
|
||||
extern int autostart;
|
||||
extern int bios_size;
|
||||
extern int cirrus_vga_enabled;
|
||||
extern int std_vga_enabled;
|
||||
|
|
4
vl.c
4
vl.c
|
@ -187,7 +187,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;
|
||||
|
@ -6091,7 +6091,7 @@ int main(int argc, char **argv, char **envp)
|
|||
qemu_start_incoming_migration(incoming);
|
||||
}
|
||||
|
||||
if (autostart)
|
||||
else if (autostart)
|
||||
vm_start();
|
||||
|
||||
#ifndef _WIN32
|
||||
|
|
Loading…
Reference in a new issue