[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [Qemu-stable] [PATCH 28/35] spapr: skip configuration s
From: |
Greg Kurz |
Subject: |
Re: [Qemu-devel] [Qemu-stable] [PATCH 28/35] spapr: skip configuration section during migration of older machines |
Date: |
Wed, 23 Mar 2016 08:59:55 +0100 |
On Tue, 22 Mar 2016 17:35:18 -0500
Michael Roth <address@hidden> wrote:
> Quoting Greg Kurz (2016-03-22 02:49:35)
> > On Mon, 21 Mar 2016 12:28:26 -0500
> > Michael Roth <address@hidden> wrote:
> >
> > > From: Greg Kurz <address@hidden>
> > >
> > > 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 <address@hidden>
> > > Reviewed-by: Laurent Vivier <address@hidden>
> > > Reviewed-by: Juan Quintela <address@hidden>
> > > Signed-off-by: David Gibson <address@hidden>
> > > (cherry picked from commit 09b5e30da5b19f44768a5429f603caaede216757)
> > >
> > > Conflicts:
> > > hw/ppc/spapr.c
> > >
> > > *remove dep on 5013c5474
> > >
> > > Signed-off-by: Michael Roth <address@hidden>
> > > ---
> >
> > This will break migration of pseries-2.3 from QEMU 2.5 to QEMU 2.5.1. Maybe
> > this should be documented somewhere ?
> >
> > Also, there's a companion patch to allow migration to succeed with manual
> > intervention on the destination:
> >
> > commit 902c053d834e3b802ec736f170edf226d4a841ff
> > Author: Greg Kurz <address@hidden>
> > Date: Thu Feb 18 12:32:25 2016 +0100
> >
> > migration: allow machine to enforce configuration section migration
> >
> > Maybe worth to push to stable as well ?
>
> Yah, makes sense. I'll include this patch and document compatibility
> changes in the release notes.
>
> Is this wording correct?
>
> "Fixes migration between QEMU 2.3 and QEMU 2.5.1 when running
> pseries-2.3 machine model. Note that for migration of same
> pseries-2.3 machine to/from QEMU versions 2.4.x and 2.5,
> the -machine enforce-config-section=on option now needs to be
> used."
>
Of course this is also the case for older pseries (< 2.3) but the wording
is correct.
Thanks !
> >
> > > hw/ppc/spapr.c | 1 +
> > > 1 file changed, 1 insertion(+)
> > >
> > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> > > index 6bfb908..ff1537a 100644
> > > --- a/hw/ppc/spapr.c
> > > +++ b/hw/ppc/spapr.c
> > > @@ -2327,6 +2327,7 @@ static void spapr_compat_2_3(Object *obj)
> > > {
> > > savevm_skip_section_footers();
> > > global_state_set_optional();
> > > + savevm_skip_configuration();
> > > }
> > >
> > > static void spapr_compat_2_2(Object *obj)
> >
- [Qemu-devel] [PATCH 29/35] hw/virtio: fix double use of a virtio flag, (continued)
- [Qemu-devel] [PATCH 29/35] hw/virtio: fix double use of a virtio flag, Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 32/35] vhost-user: don't merge regions with different fds, Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 30/35] hw/virtio: group virtio flags into an enum, Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 31/35] fw_cfg: unbreak migration compatibility for 2.4 and earlier machines, Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 22/35] fw_cfg: avoid calculating invalid current entry pointer, Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 34/35] quorum: Fix crash in quorum_aio_cb(), Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 33/35] target-arm: Make reserved ranges in ID_AA64* spaces RAZ, not UNDEF, Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 28/35] spapr: skip configuration section during migration of older machines, Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 02/35] net: vmxnet3: avoid memory leakage in activate_device, Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 04/35] configure: Fix shell syntax to placate OpenBSD's pdksh, Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 05/35] xen/blkif: Avoid double access to src->nr_segments, Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 06/35] xenfb: avoid reading twice the same fields from the shared page, Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 08/35] scsi: initialise info object with appropriate size, Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 07/35] virtio-9p: use accessor to get thread_pool, Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 35/35] vl.c: Fix regression in machine error message, Michael Roth, 2016/03/21
- [Qemu-devel] [PATCH 03/35] target-ppc: kvm: fix floating point registers sync on little-endian hosts, Michael Roth, 2016/03/21
- Re: [Qemu-devel] [Qemu-stable] [PATCH 00/35] Patch Round-up for stable 2.5.1, freeze on 2016-03-25, Cole Robinson, 2016/03/21