From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTfvU-0001au-4K for qemu-devel@nongnu.org; Wed, 10 Feb 2016 20:20:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTfvP-0004aP-0j for qemu-devel@nongnu.org; Wed, 10 Feb 2016 20:20:06 -0500 Date: Thu, 11 Feb 2016 11:20:58 +1000 From: David Gibson Message-ID: <20160211012058.GL29288@voom.bne.redhat.com> References: <20160208155947.11480.87951.stgit@bahia.huguette.org> <20160210212612.07123ed3@bahia.huguette.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="qo7zVO9a9OQ5oQtr" Content-Disposition: inline In-Reply-To: <20160210212612.07123ed3@bahia.huguette.org> Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH] spapr: skip configuration section during migration of older machines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Greg Kurz Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, "Dr. David Alan Gilbert" , Juan Quintela --qo7zVO9a9OQ5oQtr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 10, 2016 at 09:26:12PM +0100, Greg Kurz wrote: > On Mon, 08 Feb 2016 16:59:47 +0100 > 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 x8= 6. > >=20 >=20 > Ouch ! It is more complex than I thought... the migration of pseries-2.3 > machine is already broken between QEMU-2.3 and QEMU-2.4. So this patch > fixes indeed migration of a pseries-2.3 machine from QEMU-2.3, but it > breaks migration of the same machine from QEMU-2.4 and up. >=20 > Not sure how to deal with that... is it reasonable to assume that > pseries-2.3 running with QEMU-2.3 is the common case ? If so, this > patch would bring more help than harm. Ouch. I really have no idea what would be the more common case. I doubt there are many people using old upstream versions in anger, but I can't be sure of course. >=20 > > Fixes: 61964c23e5ddd5a33f15699e45ce126f879e3e33 > > Cc: qemu-stable@nongnu.org > > Signed-off-by: Greg Kurz > > --- > > hw/ppc/spapr.c | 1 + > > 1 file changed, 1 insertion(+) > >=20 > > 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(Ma= chineState *machine) > > spapr_machine_2_4_instance_options(machine); > > savevm_skip_section_footers(); > > global_state_set_optional(); > > + savevm_skip_configuration(); > > } > >=20 > > static void spapr_machine_2_3_class_options(MachineClass *mc) > >=20 > >=20 >=20 --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --qo7zVO9a9OQ5oQtr Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWu+H6AAoJEGw4ysog2bOSfbUQAI1bOsPAMewwRrqZDvWr8+KI alfGDjWXxDRYrhRQFbT8UzSgeW9I3jmGGqSLRMLQFhlhbDdz37X1txZy6a8Hs4SQ p0dB6NSjzvCtskcoATl9ZzT55N8WLsMgRKENJRKSYGNIRwXxUQ3ewQeGVSf1rztQ /mPMDM6etHYDxhshbQ2eW+qFP3gPlHV+ON6uEYzYkTDezWQs/dmq/Dl2b8PorI4S V3bScDBPDUnBT0+fL+z6VdR+f56XDIRpoTcBVkNnuruEvaHbu62S5eObJSerNEQf 6ubNJV/wF5c3lXJ/STy93OwHW2V88IbTliNRkrtpIeLTdjT93YXNsbFmCvHtJa2S xQnwwzjmd9S2OsKHxFmLrtu2IeaEncHq8+fY4VMqUi4Gd6ThRGNuxHECno/9c4Uw sS8FfeoMG+vMssyqRa5Wyxor/mQY6naQSOPYf+FnAufxNGAFJANrhVvNWLPs3K+h 5YoyqjLpkRKnph0WhOfnCkkOlJPJ6Tgg5HWvQn1eb1UdLUqkIGjtm8K1ZrJNvu04 6qe2XbCkP3Mr1rG2o/hj6bYOGPaM7pffqkHlxZ7e2CHyzx1zGshWQz06MGr//F+2 tFzYW/qqfiU0gKV6WghEFYZgPh4GhNHVuU9myWy0Aaj87zmJFfnpQrGA4Y+tz+j9 DGqbOjs9QuuZIIpI9d0+ =7PDr -----END PGP SIGNATURE----- --qo7zVO9a9OQ5oQtr--