From patchwork Mon Feb 29 06:58:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 8449041 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 A214EC0553 for ; Mon, 29 Feb 2016 06:57:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C42D201F4 for ; Mon, 29 Feb 2016 06:57:51 +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 5D35020295 for ; Mon, 29 Feb 2016 06:57:50 +0000 (UTC) Received: from localhost ([::1]:34669 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaHm9-0003l9-O3 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 29 Feb 2016 01:57:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaHlv-0003jE-D2 for qemu-devel@nongnu.org; Mon, 29 Feb 2016 01:57:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaHlu-0003fx-CR for qemu-devel@nongnu.org; Mon, 29 Feb 2016 01:57:35 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:53536) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaHlu-0003fV-1G; Mon, 29 Feb 2016 01:57:34 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 5EF05140770; 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=9/bSkREB4qkxLdGCBWBjezp/cSxWRTSYZElIg9PamMY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cmLWFm3qXJh/LYgAGOcu3B7uNipfr7cpPc7UZXuMPPOsWfK1BtQNsDkEVRv5fsofD MdzWsUL+jZlbJ9zPDL+jVTsCr5JFUa1R+EG4C7/lPPScfmEuxDN9faB/EUiYk6ptSO in2hmvQZjaVWytPHZWtpDyvqLYP2IjLspgMRYkFk= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 29 Feb 2016 17:58:27 +1100 Message-Id: <1456729111-16797-5-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 4/8] spapr: disable vmdesc submission for old 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.3, we have a vmdesc section in the migration stream. This section is not mandatory but when migrating a pseries-2.2 machine from QEMU 2.2, you get a warning at the destination: qemu-system-ppc64: Expected vmdescription section, but got 0 The warning goes away if we decide to skip vmdesc as well for older pseries, like it is already done for pc's. This can only be observed with -cpu POWER7 because POWER8 cannot migrate from QEMU 2.2 to 2.3 (insns_flags2 mismatch). Signed-off-by: Greg Kurz 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 c119f55..3b4a557 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2452,6 +2452,7 @@ DEFINE_SPAPR_MACHINE(2_3, "2.3", false); static void spapr_machine_2_2_instance_options(MachineState *machine) { spapr_machine_2_3_instance_options(machine); + machine->suppress_vmdesc = true; } static void spapr_machine_2_2_class_options(MachineClass *mc)