| Message ID | 20160223164759.28588.87119.stgit@bahia.huguette.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Feb 23, 2016 at 05:47:59PM +0100, Greg Kurz wrote: > Since QEMU 2.3, we have a vmdesc section in the migration stream. > This section is not mandatory but when migrating a pseries-2.2 > machine from QEMU 2.2, you get a warning at the destination: > > qemu-system-ppc64: Expected vmdescription section, but got 0 > > The warning goes away if we decide to skip vmdesc as well for > older pseries, like it is already done for pc's. > > This can only be observed with -cpu POWER7 because POWER8 > cannot migrate from QEMU 2.2 to 2.3 (insns_flags2 mismatch). > > Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> Applied to ppc-for-2.6, thanks. > --- > hw/ppc/spapr.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index c119f5582429..3b4a557c0a91 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2452,6 +2452,7 @@ DEFINE_SPAPR_MACHINE(2_3, "2.3", false); > static void spapr_machine_2_2_instance_options(MachineState *machine) > { > spapr_machine_2_3_instance_options(machine); > + machine->suppress_vmdesc = true; > } > > static void spapr_machine_2_2_class_options(MachineClass *mc) > >
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c119f5582429..3b4a557c0a91 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2452,6 +2452,7 @@ DEFINE_SPAPR_MACHINE(2_3, "2.3", false); static void spapr_machine_2_2_instance_options(MachineState *machine) { spapr_machine_2_3_instance_options(machine); + machine->suppress_vmdesc = true; } static void spapr_machine_2_2_class_options(MachineClass *mc)
Since QEMU 2.3, we have a vmdesc section in the migration stream. This section is not mandatory but when migrating a pseries-2.2 machine from QEMU 2.2, you get a warning at the destination: qemu-system-ppc64: Expected vmdescription section, but got 0 The warning goes away if we decide to skip vmdesc as well for older pseries, like it is already done for pc's. This can only be observed with -cpu POWER7 because POWER8 cannot migrate from QEMU 2.2 to 2.3 (insns_flags2 mismatch). Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> --- hw/ppc/spapr.c | 1 + 1 file changed, 1 insertion(+)