On 18/02/2016 12:32, Greg Kurz wrote: > QEMU 2.4 broke the migration of old pseries machine with the addition > of configuration sections, which are sent unconditionally. > > We assume that QEMU 2.3 is more deployed than any newer release (based on > the versions currently shipped by most distros). This v3 series hence > reverses the logic from v2: it now fully fixes migration of old pseries > from/to QEMU 2.3 and provides a manual workaround for the QEMU 2.4/2.4.1/2.5 > case. > > With this series, I could migrate the same pseries-2.3 instance in a full > 2.3->2.6->2.5->2.6->2.4->2.6->2.3 cycle. > > --- > > Greg Kurz (2): > spapr: skip configuration section during migration of older machines > migration: allow machine to enforce configuration section migration > > > hw/core/machine.c | 21 +++++++++++++++++++++ > hw/ppc/spapr.c | 1 + > include/hw/boards.h | 1 + > migration/savevm.c | 10 ++++++++-- > qemu-options.hx | 3 ++- > 5 files changed, 33 insertions(+), 3 deletions(-)
For the series Tested-by: Laurent Vivier <lviv...@redhat.com> Results of tests: pseries-2.3 qemu-2.3.0 -> qemu-master: OK qemu-2.3.1 -> qemu-master: OK qemu-2.4.0 -> qemu-master: OK with qom-set qemu-2.4.1 -> qemu-master: OK with qom-set qemu-2.5.0 -> qemu-master: OK with qom-set qemu-master -> qemu-2.3.0: OK qemu-master -> qemu-2.3.1: OK qemu-master -> qemu-2.4.0: OK with qom-set qemu-master -> qemu-2.4.1: OK with qom-set qemu-master -> qemu-2.5.0: OK with qom-set qemu-master -> qemu-master: OK pseries-2.4, pseries-2.5 and pseries-2.6 works well with the patch applied too. master is "b527c9b qcow2: Write full header on image creation" + this series Laurent