From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55742)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gkurz@linux.vnet.ibm.com>) id 1aTVDy-0007Be-Bh
	for qemu-devel@nongnu.org; Wed, 10 Feb 2016 08:54:31 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gkurz@linux.vnet.ibm.com>) id 1aTVDq-0006fe-3r
	for qemu-devel@nongnu.org; Wed, 10 Feb 2016 08:54:30 -0500
Received: from e06smtp08.uk.ibm.com ([195.75.94.104]:59869)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gkurz@linux.vnet.ibm.com>) id 1aTVDp-0006dF-Qx
	for qemu-devel@nongnu.org; Wed, 10 Feb 2016 08:54:22 -0500
Received: from localhost
	by e06smtp08.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 13:54:18 -0000
Date: Wed, 10 Feb 2016 14:54:07 +0100
From: Greg Kurz <gkurz@linux.vnet.ibm.com>
Message-ID: <20160210145407.4a84785b@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-stable] [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: Michael Roth <mdroth@linux.vnet.ibm.com>, Alexander Graf <agraf@suse.de>, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, qemu-stable@nongnu.org

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

Heh this patch doesn't apply on 2.4.1 actually because the context
changed a bit... does it make sense to backport this patch to
stable-2.4 or should the issue be fixed downstream ?

Cc'ed stable release maintainer Michael Roth for inputs.

>  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)
> 
>