Message ID | 20160215101514.32327.78919.stgit@bahia.huguette.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C269814030E for <incoming@patchwork.ozlabs.org>; Mon, 15 Feb 2016 21:16:13 +1100 (AEDT) Received: from localhost ([::1]:58626 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1aVGCR-0007xT-PT for incoming@patchwork.ozlabs.org; Mon, 15 Feb 2016 05:16:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <gkurz@linux.vnet.ibm.com>) id 1aVGBi-0006uu-Ec for qemu-devel@nongnu.org; Mon, 15 Feb 2016 05:15:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <gkurz@linux.vnet.ibm.com>) id 1aVGBd-0000m9-6W for qemu-devel@nongnu.org; Mon, 15 Feb 2016 05:15:26 -0500 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:42093) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <gkurz@linux.vnet.ibm.com>) id 1aVGBc-0000lv-Rt for qemu-devel@nongnu.org; Mon, 15 Feb 2016 05:15:21 -0500 Received: from localhost by e06smtp11.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>; Mon, 15 Feb 2016 10:15:20 -0000 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 15 Feb 2016 10:15:18 -0000 X-IBM-Helo: d06dlp03.portsmouth.uk.ibm.com X-IBM-MailFrom: gkurz@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org;qemu-ppc@nongnu.org Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 81AF61B08061; Mon, 15 Feb 2016 10:15:33 +0000 (GMT) Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u1FAFHxn2097482; Mon, 15 Feb 2016 10:15:17 GMT Received: from d06av09.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u1FAFHQ8024127; Mon, 15 Feb 2016 03:15:17 -0700 Received: from smtp.lab.toulouse-stg.fr.ibm.com (srv01.lab.toulouse-stg.fr.ibm.com [9.101.4.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u1FAFGfj024066; Mon, 15 Feb 2016 03:15:17 -0700 Received: from bahia.huguette.org (sig-9-78-88-59.uk.ibm.com [9.78.88.59]) by smtp.lab.toulouse-stg.fr.ibm.com (Postfix) with ESMTP id 2AEE3220220; Mon, 15 Feb 2016 11:15:15 +0100 (CET) From: Greg Kurz <gkurz@linux.vnet.ibm.com> To: Juan Quintela <quintela@redhat.com> Date: Mon, 15 Feb 2016 11:15:14 +0100 Message-ID: <20160215101514.32327.78919.stgit@bahia.huguette.org> In-Reply-To: <20160215100313.32327.90332.stgit@bahia.huguette.org> References: <20160215100313.32327.90332.stgit@bahia.huguette.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16021510-0041-0000-0000-000007838B97 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.107 Cc: Amit Shah <amit.shah@redhat.com>, David Gibson <david@gibson.dropbear.id.au>, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, "Dr. David Alan Gilbert" <dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] spapr: fix migration of older pseries X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list 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> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org |
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 5bd8fd3ef842..cd6681acb87b 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(); + machine->config_section = false; } static void spapr_machine_2_3_class_options(MachineClass *mc)
Use the config_section machine property to fix migration of older pseries started with an older QEMU (version < 2.4 for both). Older machines started with QEMU 2.4 are not affected by this change since they send the configuration section unconditionally. Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> --- hw/ppc/spapr.c | 1 + 1 file changed, 1 insertion(+)