| Message ID | 20160218113218.9760.89211.stgit@bahia.huguette.org |
|---|---|
| State | New |
| Headers | show |
On 18/02/2016 12:32, Greg Kurz wrote: > Since QEMU 2.4, we have a configuration section in the migration stream. > This must be skipped for older machines, like it is already done for x86. > > This patch fixes the migration of pseries-2.3 from/to QEMU 2.3, but it > breaks migration of the same machine from/to QEMU 2.4/2.4.1/2.5. We do > that anyway because QEMU 2.3 is likely to be more widely deployed than > newer QEMU versions. > > Fixes: 61964c23e5ddd5a33f15699e45ce126f879e3e33 > Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> Reviewed-by: Laurent Vivier <lvivier@redhat.com> > --- > hw/ppc/spapr.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 5bd8fd3ef842..bca7cb8a5d27 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2446,6 +2446,7 @@ static void spapr_machine_2_3_instance_options(MachineState *machine) > spapr_machine_2_4_instance_options(machine); > savevm_skip_section_footers(); > global_state_set_optional(); > + savevm_skip_configuration(); > } > > static void spapr_machine_2_3_class_options(MachineClass *mc) >
Greg Kurz <gkurz@linux.vnet.ibm.com> wrote: > Since QEMU 2.4, we have a configuration section in the migration stream. > This must be skipped for older machines, like it is already done for x86. > > This patch fixes the migration of pseries-2.3 from/to QEMU 2.3, but it > breaks migration of the same machine from/to QEMU 2.4/2.4.1/2.5. We do > that anyway because QEMU 2.3 is likely to be more widely deployed than > newer QEMU versions. > > Fixes: 61964c23e5ddd5a33f15699e45ce126f879e3e33 > Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> Reviewed-by: Juan Quintela <quintela@redhat.com>
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 5bd8fd3ef842..bca7cb8a5d27 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2446,6 +2446,7 @@ static void spapr_machine_2_3_instance_options(MachineState *machine) spapr_machine_2_4_instance_options(machine); savevm_skip_section_footers(); global_state_set_optional(); + savevm_skip_configuration(); } static void spapr_machine_2_3_class_options(MachineClass *mc)
Since QEMU 2.4, we have a configuration section in the migration stream. This must be skipped for older machines, like it is already done for x86. This patch fixes the migration of pseries-2.3 from/to QEMU 2.3, but it breaks migration of the same machine from/to QEMU 2.4/2.4.1/2.5. We do that anyway because QEMU 2.3 is likely to be more widely deployed than newer QEMU versions. Fixes: 61964c23e5ddd5a33f15699e45ce126f879e3e33 Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> --- hw/ppc/spapr.c | 1 + 1 file changed, 1 insertion(+)