From patchwork Fri Jun 11 23:46:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 12316757 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70C83C48BE6 for ; Sat, 12 Jun 2021 00:15:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F1E19611C9 for ; Sat, 12 Jun 2021 00:15:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F1E19611C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrrJ7-0001xi-1a for qemu-devel@archiver.kernel.org; Fri, 11 Jun 2021 20:15:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrqsB-0006Vq-2E; Fri, 11 Jun 2021 19:47:35 -0400 Received: from mout.gmx.net ([212.227.15.15]:52571) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrqs6-0006Ay-Qv; Fri, 11 Jun 2021 19:47:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1623455241; bh=QbhSxLeKcFBz1aqno/rerDdcDjyI9405VKqcoSqOeig=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=AwJ2Wb2j25TZUfY1sLmpzxjcXEMP/4wLzS8NE3tmgJhTQZ9fai/S2MgIRR5+XVv7n Unjn6h+xMbOAzRCAzAWYcjPj+RWvlbmFiGlbv3DfHdV3A08niDwM59e3GunZnlha4k x9qJrLjDrRSl8P0syb9de401gxXEI4xcmo4D85Qk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.247.63]) by mail.gmx.net (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1N33Il-1lCe3Q047h-013Lfi; Sat, 12 Jun 2021 01:47:21 +0200 From: Heinrich Schuchardt To: Keith Busch , Klaus Jensen , Peter Maydell Subject: [PATCH v2 1/3] hw: virt: consider hw_compat_6_0 Date: Sat, 12 Jun 2021 01:46:29 +0200 Message-Id: <20210611234631.81314-2-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210611234631.81314-1-xypron.glpk@gmx.de> References: <20210611234631.81314-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:znDoEkAvZdWcOR+gBVBQRClwj++qILoM1PS4XZ3m6wwJRYoDPfC YaNsU+nJocCSrI7TfjbBvvsLf8ryTBHCfU8ovW+PFj4bNMmxfhMni8H0CThIvGE1n1Q31oc U++9nrpCaxSKlwew5ZTKEgDrqucoWPnZ+/S73hTwMT8l/FPHcLSB5AHf+Ll+UR3389lCo0P B/ayF6bISbn5kY3zjOHMg== X-UI-Out-Filterresults: notjunk:1;V03:K0:w/ioPm30SsE=:MGKnIK9n/b0xnw5zC7ca/K /3C2z9S4RmXMDi1KK5S6aZa25qPolGZjXTAjoARLkuTTroGy5zZTWveJNp9ZUzjlealqQ+Q5a fo4T6LMDJ4h2h6WZ1oPiZMNKRxEWnkRD5e3CWzbQxr99GmEZjAksA5Y/bcoW4NjfyNNxkI2Xz wtHe6O2LkFvFvIkhCW+zGdaJCw7IudPQ+hW5QCiNIRHWMcq74axzdaPEUsgVqMS7XxIk5Du7l ogJnwHwWeWxFqBg9yDh7SEKMWo5r6uLA2cuSvNkLVCQ4hflO92t9r+OGzkwY+HYHzkYRkqXJI +h3aPW/Oup1Jyy2zCjKKDGigZD4/yIRIcWT2D9VcfGuXKjRiE6YLarxvckDYJVYIUsVZ7QPYI 8dmUNky1qb+G6FBF560NlpyGwhqOOkL1uKs4ErrgXRtnd8HvI1Tp3B0uK414uaurLzhvktTMK AAZ86kSvD9lyDHHM87sm9h1q1coJMtKkzVdJzNki3Fqkq2m9uIX+TzGhN8RjBT/SHy5c4KUbc cRRNoO54Ux0n71iqefxxH/wRlv9WfaNzJVPdSyzLwGvopW682I4K+7CdcLB9bywNTdm5iQGFe aTX9N+tD78L1hgkkkbhgG/a+GiPmsyC1rnxsvmT4Wd/WujWSuFgxF0FhljFewwn6kIx/a91+Q aaam7P454D1qVxHiwbNvpXDUljXfMbWmABGfXML84w6IfXM4Cgod6MCDHOIs9zbi6qA9BRYB8 5c3dQd8enCJHkZ7z2BH85CPLFhfJdY6UQmOifkCW5EJeo+xDRKsiKxt3NC0LzwVIY5jJZfTfr 8UFQSaj6sR08RU8CMZilxXld4ZWryOQuYj/1R3XV5ozaiiQgGkyW09keGBj3KV8+90+08R2Br 7+A0SXrFPptHtw2NJtaIcXVl+rN2Af8LdUFhAGfy2RMbvzSoZVhV73K9OaT3tWO5fZin9GLx5 ojaGiG6D7sHR/9GjFpyqMCJ+gxmmvY8tAnSEmrP+YGwKi7ZfizOS8UjZHJbZ9BvY1AUxjdSCV GAVyT68DpSsl9F3/IQNkdZGYpbHZBpPnFyKW2nsBukuOI210GzO65Ug98zrijq9IHxBB7Qerm 79Qv4scTEi7kmTHNWGYvVnm7Vl18s7o5Qf1 Received-SPF: pass client-ip=212.227.15.15; envelope-from=xypron.glpk@gmx.de; helo=mout.gmx.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , qemu-block@nongnu.org, Heinrich Schuchardt , Cornelia Huck , qemu-devel@nongnu.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" virt-6.0 must consider hw_compat_6_0. Fixes: da7e13c00b59 ("hw: add compat machines for 6.1") Signed-off-by: Heinrich Schuchardt Reviewed-by: Cornelia Huck --- v2: add missing Fixes: tag --- hw/arm/virt.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.30.2 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 840758666d..8bc3b408fe 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2764,6 +2764,8 @@ DEFINE_VIRT_MACHINE_AS_LATEST(6, 1) static void virt_machine_6_0_options(MachineClass *mc) { + virt_machine_6_1_options(mc); + compat_props_add(mc->compat_props, hw_compat_6_0, hw_compat_6_0_len); } DEFINE_VIRT_MACHINE(6, 0)