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

migration: Fix regression for xenfv and pc,accel=xen machine.

Browse Source 
This fix migration from the same QEMU version and from previous QEMU
version.

>From the global state section, we don't need runstate with Xen. Right now,
the way the Xen toolstack knows when QEMU is ready is when QEMU reach
"running" runstate.

The configuration section and the section footers are not going to be
present in previous version of QEMU with xenfv machine, so we skip them.

The Xen toolstack libxenlight does not specify a particular version of the
'pc' machine, so migration from older version of QEMU used by Xen to newer
one would break due to missing "configuration" section and section footers.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
This commit is contained in:
Anthony PERARD 2015-08-03 15:29:21 +01:00 committed by Stefano Stabellini
parent c69adea462
commit 8c6dc68f4c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xen-common.c
View File

@ -12,6 +12,7 @@
#include "qmp-commands.h" #include "qmp-commands.h"
#include "sysemu/char.h" #include "sysemu/char.h"
#include "sysemu/accel.h" #include "sysemu/accel.h"
#include "migration/migration.h"
//#define DEBUG_XEN //#define DEBUG_XEN
@ -119,6 +120,10 @@ static int xen_init(MachineState *ms)
} }
qemu_add_vm_change_state_handler(xen_change_state_handler, NULL); qemu_add_vm_change_state_handler(xen_change_state_handler, NULL);
global_state_set_optional();
savevm_skip_configuration();
savevm_skip_section_footers();
return 0; return 0;
} }