| Message ID | 1438612161-15822-4-git-send-email-anthony.perard@citrix.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 3 Aug 2015, Anthony PERARD wrote: > 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> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > xen-common.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/xen-common.c b/xen-common.c > index 56359ca..0dcdbc3 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; > } > > -- > Anthony PERARD >
diff --git a/xen-common.c b/xen-common.c index 56359ca..0dcdbc3 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; }
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> --- xen-common.c | 5 +++++ 1 file changed, 5 insertions(+)