From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49524)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gkurz@linux.vnet.ibm.com>) id 1aTbLF-0001z3-9C
	for qemu-devel@nongnu.org; Wed, 10 Feb 2016 15:26:26 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gkurz@linux.vnet.ibm.com>) id 1aTbLC-0008Oe-Gu
	for qemu-devel@nongnu.org; Wed, 10 Feb 2016 15:26:25 -0500
Received: from e06smtp06.uk.ibm.com ([195.75.94.102]:50096)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gkurz@linux.vnet.ibm.com>) id 1aTbLB-0008OL-V5
	for qemu-devel@nongnu.org; Wed, 10 Feb 2016 15:26:22 -0500
Received: from localhost
	by e06smtp06.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use
	Only! Violators will be prosecuted
	for <qemu-devel@nongnu.org> from <gkurz@linux.vnet.ibm.com>;
	Wed, 10 Feb 2016 20:26:19 -0000
Date: Wed, 10 Feb 2016 21:26:12 +0100
From: Greg Kurz <gkurz@linux.vnet.ibm.com>
Message-ID: <20160210212612.07123ed3@bahia.huguette.org>
In-Reply-To: <20160208155947.11480.87951.stgit@bahia.huguette.org>
References: <20160208155947.11480.87951.stgit@bahia.huguette.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH] spapr: skip configuration
 section during migration of older machines
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: David Gibson <david@gibson.dropbear.id.au>
Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, "Dr.	David Alan Gilbert" <dgilbert@redhat.com>, Juan Quintela <quintela@redhat.com>

On Mon, 08 Feb 2016 16:59:47 +0100
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.
> 

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.

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.

> Fixes: 61964c23e5ddd5a33f15699e45ce126f879e3e33
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.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)
> 
>