Skip to content

Commit

Permalink
migration: Fix regression for xenfv and pc,accel=xen machine.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
anthonyper-ctx authored and Stefano Stabellini committed Aug 3, 2015
1 parent c69adea commit 8c6dc68
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions xen-common.c
Expand Up @@ -12,6 +12,7 @@
#include "qmp-commands.h"
#include "sysemu/char.h"
#include "sysemu/accel.h"
#include "migration/migration.h"

//#define DEBUG_XEN

Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 8c6dc68

Please sign in to comment.