From patchwork Mon Feb 29 06:58:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 8449101 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 51063C0553 for ; Mon, 29 Feb 2016 07:00:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ADE5E202A1 for ; Mon, 29 Feb 2016 07:00:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 12D4220263 for ; Mon, 29 Feb 2016 07:00:57 +0000 (UTC) Received: from localhost ([::1]:34710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaHpA-00016I-Iy for patchwork-qemu-devel@patchwork.kernel.org; Mon, 29 Feb 2016 02:00:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaHlv-0003jF-Q7 for qemu-devel@nongnu.org; Mon, 29 Feb 2016 01:57:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaHlu-0003gA-GK for qemu-devel@nongnu.org; Mon, 29 Feb 2016 01:57:35 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:42299) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaHlu-0003fY-5q; Mon, 29 Feb 2016 01:57:34 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id E1865140784; Mon, 29 Feb 2016 17:57:29 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1456729049; bh=ED+Fd9v0UumG6cMg2xMg5ifl0TcW4o1Qj9s3v90KD00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YFYoUI8vPC1E2Wzve2CY83aSg9uQ1L7HK53/MI06BBZxboafC5HoP7jF6HJ5H+8j1 DIWm5mWZ8LYrwGe92QMNJTukfutRRrbN2f7LhEbR+/3cA/9KWOyYFZTHofWXWE4yxm Iwir4L1jmn+tjnI3taCNtqIGuEo+mEAAR5kBqlc4= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 29 Feb 2016 17:58:29 +1100 Message-Id: <1456729111-16797-7-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456729111-16797-1-git-send-email-david@gibson.dropbear.id.au> References: <1456729111-16797-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Cc: mdroth@linux.vnet.ibm.com, aik@ozlabs.ru, qemu-devel@nongnu.org, agraf@suse.de, qemu-ppc@nongnu.org, David Gibson , Greg Kurz Subject: [Qemu-devel] [PULL 6/8] spapr: skip configuration section during migration of older machines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Greg Kurz 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 Reviewed-by: Laurent Vivier Reviewed-by: Juan Quintela Signed-off-by: David Gibson --- hw/ppc/spapr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 3b4a557..e9d4abf 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2427,6 +2427,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)