diff options
| author | Anthony PERARD <anthony.perard@citrix.com> | 2015-08-03 15:29:21 +0100 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2015-08-03 16:13:40 +0000 |
| commit | 8c6dc68f4cff9eef870497a19a5373dde9dbdcc2 (patch) | |
| tree | 88dcd36e5ae08283a170ee8bf9394932c94a5871 /xen-common.c | |
| parent | c69adea462a97c02001b2dd1edd2a0692d27f5a2 (diff) | |
| download | qemu-8c6dc68f4cff9eef870497a19a5373dde9dbdcc2.tar.gz qemu-8c6dc68f4cff9eef870497a19a5373dde9dbdcc2.tar.bz2 qemu-8c6dc68f4cff9eef870497a19a5373dde9dbdcc2.zip | |
migration: Fix regression for xenfv and pc,accel=xen machine.
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>
Diffstat (limited to 'xen-common.c')
| -rw-r--r-- | xen-common.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/xen-common.c b/xen-common.c index 56359ca725..0dcdbc39f4 100644 --- a/xen-common.c +++ b/xen-common.c @@ -12,6 +12,7 @@ #include "qmp-commands.h" #include "sysemu/char.h" #include "sysemu/accel.h" +#include "migration/migration.h" //#define DEBUG_XEN @@ -119,6 +120,10 @@ static int xen_init(MachineState *ms) } qemu_add_vm_change_state_handler(xen_change_state_handler, NULL); + global_state_set_optional(); + savevm_skip_configuration(); + savevm_skip_section_footers(); + return 0; } |