From nobody Wed May 15 19:10:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625756211983493.9645180846712; Thu, 8 Jul 2021 07:56:51 -0700 (PDT) Received: from localhost ([::1]:44270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1VSM-00082k-Ub for importer@patchew.org; Thu, 08 Jul 2021 10:56:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1VQz-0005er-TE; Thu, 08 Jul 2021 10:55:25 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:36844) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1VQx-0000e6-Jr; Thu, 08 Jul 2021 10:55:25 -0400 Received: by mail-wm1-x32e.google.com with SMTP id t14-20020a05600c198eb029020c8aac53d4so19390773wmq.1; Thu, 08 Jul 2021 07:55:21 -0700 (PDT) Received: from x1w.redhat.com (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id b15sm2946818wrr.27.2021.07.08.07.55.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 07:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EGgp09RsVOCSFCjaMEA6IaUU8QHPgSGRi2gDNFsMWL4=; b=FobCjzomld61YWISboOqgQ6cUHx0++BnIak0TZc/woyjdKL4wX9UDrBss8/UelPCtT OqRbiw5eVUAda9BbGdbqzLTcQqoPjyxAjGoIF6IzgK/8FrtzcMi6HhFlOJmbgPE1L0yS atOB8aF8TEu7LiHm8R942lFsqn6tMPF3gBSufuzT8EFk2FCl4+/SGcIrnAYYIGkZy30e 95Zou/ymID/uiAh5A81FlpPc7XYD6n2Kltj4r3J4r3TVqt277TXjxDCu15pFTysG/dBe e9bNB7RG48BwCQPpSf1WrWxlIrDQ3trnnnlEAybigpvRQhRpdPCqIk0JUy1WPtAXNr61 oR8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=EGgp09RsVOCSFCjaMEA6IaUU8QHPgSGRi2gDNFsMWL4=; b=MWECz5gBrF4Ou6K/RGlU+RD69NCGJ/aYK2m/t8RanhvlSnLbal5G9tBtKmj7bjCj4T punBGGqUm7Eom+KhwjV1myKzO2CwU3NjlQd/HkNmRnfrERVrwlDp2AMvuJ6T5YVk8toZ i3NNEeaZHFwkqwTG0kEDSLffS+lyc2w95XobCp+zH3JZAocqHzX6Xf5oScdqSFEfpHi0 Ge73bFREYHouikvtDNIMLMuZa0ypOX5Og+HMe7cEJnRXxxb9152Kh8u+exlOnJVIsOJi ILadDNhID/ldquVVLB5MXC68dRBUERpJEE8Q7FLy14qeV9JmqLqlDjJX6LFIio8vPRlX jrHw== X-Gm-Message-State: AOAM532lfdSvr8lb2p5Z+b7w5CD/uMlWnfik+0IKGaI108w796aO6KUO ye9kBde363NDlrcEYPEf5rxpKCXZ6DM= X-Google-Smtp-Source: ABdhPJwAu3cP5PsFcqMnlyfaLHMzVOBIOvh9EOyg7XLI7MaD0rSaqEaZGdP0jxFi2MQilERaDELQXQ== X-Received: by 2002:a7b:c778:: with SMTP id x24mr1336783wmk.77.1625756120328; Thu, 08 Jul 2021 07:55:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 1/2] tests: Remove uses of deprecated raspi2/raspi3 machine names Date: Thu, 8 Jul 2021 16:55:13 +0200 Message-Id: <20210708145514.1751773-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210708145514.1751773-1-f4bug@amsat.org> References: <20210708145514.1751773-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32e.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, WEIRD_QUOTING=0.001 autolearn=no 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: Peter Maydell , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625756213446100001 Commit 155e1c82ed0 deprecated the raspi2/raspi3 machine names. Use the recommended new names: raspi2b and raspi3b. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/devel/qgraph.rst | 38 ++++++++++++------------- tests/qtest/libqos/qgraph.h | 6 ++-- tests/qtest/libqos/qgraph_internal.h | 2 +- tests/qtest/boot-serial-test.c | 2 +- tests/qtest/libqos/arm-raspi2-machine.c | 8 +++--- tests/unit/test-qgraph.c | 2 +- tests/acceptance/boot_linux_console.py | 6 ++-- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/devel/qgraph.rst b/docs/devel/qgraph.rst index 318534d4b08..760764af2c7 100644 --- a/docs/devel/qgraph.rst +++ b/docs/devel/qgraph.rst @@ -41,7 +41,7 @@ Nodes =20 A node can be of four types: =20 -- **QNODE_MACHINE**: for example ``arm/raspi2`` +- **QNODE_MACHINE**: for example ``arm/raspi2b`` - **QNODE_DRIVER**: for example ``generic-sdhci`` - **QNODE_INTERFACE**: for example ``sdhci`` (interface for all ``-sdhci`` drivers). @@ -119,12 +119,12 @@ It is possible to troubleshoot unavailable tests by r= unning:: # |-> dest=3D'i440FX-pcihost' type=3D0 (node=3D0x5591421117f0) # src=3D'' # |-> dest=3D'x86_64/pc' type=3D0 (node=3D0x559142111600) - # |-> dest=3D'arm/raspi2' type=3D0 (node=3D0x559142110740) + # |-> dest=3D'arm/raspi2b' type=3D0 (node=3D0x559142110740) ... # } # ALL QGRAPH NODES: { # name=3D'virtio-net-tests/announce-self' type=3D3 cmd_line=3D'(null)'= [available] - # name=3D'arm/raspi2' type=3D0 cmd_line=3D'-M raspi2 ' [UNAVAILABLE] + # name=3D'arm/raspi2b' type=3D0 cmd_line=3D'-M raspi2b ' [UNAVAILABLE] ... # } =20 @@ -135,8 +135,8 @@ qgraph path in the "ALL QGRAPH EDGES" output as follows= : '' -> 'x86_64/pc' -> 'virtio-net'. The root of the qgraph is '' and the depth first search begi= ns there. =20 -The ``arm/raspi`` machine node is listed as "UNAVAILABLE". Although it is -reachable from the root via '' -> 'arm/raspi2' the node is unavailable bec= ause +The ``arm/raspi2b`` machine node is listed as "UNAVAILABLE". Although it is +reachable from the root via '' -> 'arm/raspi2b' the node is unavailable be= cause the QEMU binary did not list it when queried by the framework. This is exp= ected because we used the ``qemu-system-x86_64`` binary which does not support A= RM machine types. @@ -158,7 +158,7 @@ Here we continue the ``sdhci`` use case, with the follo= wing scenario: - ``sdhci-test`` aims to test the ``read[q,w], writeq`` functions offered by the ``sdhci`` drivers. - The current ``sdhci`` device is supported by both ``x86_64/pc`` and ``AR= M`` - (in this example we focus on the ``arm-raspi2``) machines. + (in this example we focus on the ``arm-raspi2b``) machines. - QEMU offers 2 types of drivers: ``QSDHCI_MemoryMapped`` for ``ARM`` and ``QSDHCI_PCI`` for ``x86_64/pc``. Both implement the ``read[q,w], writeq`` functions. @@ -180,11 +180,11 @@ In order to implement such scenario in qgraph, the te= st developer needs to: all the pci drivers available) =20 ``sdhci-pci --consumes--> pci-bus`` -- Create an ``arm/raspi2`` machine node. This machine ``contains`` +- Create an ``arm/raspi2b`` machine node. This machine ``contains`` a ``generic-sdhci`` memory mapped ``sdhci`` driver node, representing ``QSDHCI_MemoryMapped``. =20 - ``arm/raspi2 --contains--> generic-sdhci`` + ``arm/raspi2b --contains--> generic-sdhci`` - Create the ``sdhci`` interface node. This interface offers the functions that are shared by all ``sdhci`` devices. The interface is produced by ``sdhci-pci`` and ``generic-sdhci``, @@ -199,7 +199,7 @@ In order to implement such scenario in qgraph, the test= developer needs to: =20 ``sdhci-test --consumes--> sdhci`` =20 -``arm-raspi2`` machine, simplified from +``arm-raspi2b`` machine, simplified from ``tests/qtest/libqos/arm-raspi2-machine.c``:: =20 #include "qgraph.h" @@ -217,7 +217,7 @@ In order to implement such scenario in qgraph, the test= developer needs to: return &machine->alloc; } =20 - fprintf(stderr, "%s not present in arm/raspi2\n", interface); + fprintf(stderr, "%s not present in arm/raspi2b\n", interface); g_assert_not_reached(); } =20 @@ -229,7 +229,7 @@ In order to implement such scenario in qgraph, the test= developer needs to: return &machine->sdhci.obj; } =20 - fprintf(stderr, "%s not present in arm/raspi2\n", device); + fprintf(stderr, "%s not present in arm/raspi2b\n", device); g_assert_not_reached(); } =20 @@ -253,10 +253,10 @@ In order to implement such scenario in qgraph, the te= st developer needs to: =20 static void raspi2_register_nodes(void) { - /* arm/raspi2 --contains--> generic-sdhci */ - qos_node_create_machine("arm/raspi2", + /* arm/raspi2b --contains--> generic-sdhci */ + qos_node_create_machine("arm/raspi2b", qos_create_machine_arm_raspi2); - qos_node_contains("arm/raspi2", "generic-sdhci", NULL); + qos_node_contains("arm/raspi2b", "generic-sdhci", NULL); } =20 libqos_init(raspi2_register_nodes); @@ -470,7 +470,7 @@ In the above example, all possible types of relations a= re created:: | +--produces-- + | - arm/raspi2 --contains--> generic-sdhci + arm/raspi2b --contains--> generic-sdhci =20 or inverting the consumes edge in consumed_by:: =20 @@ -486,7 +486,7 @@ or inverting the consumes edge in consumed_by:: | +--produces-- + | - arm/raspi2 --contains--> generic-sdhci + arm/raspi2b --contains--> generic-sdhci =20 Adding a new test """"""""""""""""" @@ -536,7 +536,7 @@ Final graph will be like this:: | +--produces-- + | - arm/raspi2 --contains--> generic-sdhci + arm/raspi2b --contains--> generic-sdhci =20 or inverting the consumes edge in consumed_by:: =20 @@ -552,7 +552,7 @@ or inverting the consumes edge in consumed_by:: | +--produces-- + | - arm/raspi2 --contains--> generic-sdhci + arm/raspi2b --contains--> generic-sdhci =20 Assuming there the binary is ``QTEST_QEMU_BINARY=3D./qemu-system-x86_64`` @@ -561,7 +561,7 @@ a valid test path will be: =20 and for the binary ``QTEST_QEMU_BINARY=3D./qemu-system-arm``: =20 -``/arm/raspi2/generic-sdhci/sdhci/sdhci-test`` +``/arm/raspi2b/generic-sdhci/sdhci/sdhci-test`` =20 Additional examples are also in ``test-qgraph.c`` =20 diff --git a/tests/qtest/libqos/qgraph.h b/tests/qtest/libqos/qgraph.h index 54672350c8f..871740c0dc8 100644 --- a/tests/qtest/libqos/qgraph.h +++ b/tests/qtest/libqos/qgraph.h @@ -252,17 +252,17 @@ void qos_node_create_driver_named(const char *name, c= onst char *qemu_name, * This function can be useful when there are multiple devices * with the same node name contained in a machine/other node * - * For example, if ``arm/raspi2`` contains 2 ``generic-sdhci`` + * For example, if ``arm/raspi2b`` contains 2 ``generic-sdhci`` * devices, the right commands will be: * * .. code:: * - * qos_node_create_machine("arm/raspi2"); + * qos_node_create_machine("arm/raspi2b"); * qos_node_create_driver("generic-sdhci", constructor); * // assume rest of the fields are set NULL * QOSGraphEdgeOptions op1 =3D { .edge_name =3D "emmc" }; * QOSGraphEdgeOptions op2 =3D { .edge_name =3D "sdcard" }; - * qos_node_contains("arm/raspi2", "generic-sdhci", &op1, &op2, NULL); + * qos_node_contains("arm/raspi2b", "generic-sdhci", &op1, &op2, NULL); * * Of course this also requires that the @container's get_device function * should implement a case for "emmc" and "sdcard". diff --git a/tests/qtest/libqos/qgraph_internal.h b/tests/qtest/libqos/qgra= ph_internal.h index c0025f5ab9b..7d62fd17af7 100644 --- a/tests/qtest/libqos/qgraph_internal.h +++ b/tests/qtest/libqos/qgraph_internal.h @@ -230,7 +230,7 @@ void qos_graph_foreach_test_path(QOSTestCallback fn); /** * qos_get_machine_type(): return QEMU machine type for a machine node. * This function requires every machine @name to be in the form - * /, like "arm/raspi2" or "x86_64/pc". + * /, like "arm/raspi2b" or "x86_64/pc". * * The function will validate the format and return a pointer to * @machine to . For example, when passed "x86_64/pc" diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c index d40adddafa3..5e2d934b76f 100644 --- a/tests/qtest/boot-serial-test.c +++ b/tests/qtest/boot-serial-test.c @@ -138,7 +138,7 @@ static testdef_t tests[] =3D { sizeof(kernel_pls3adsp1800), kernel_pls3adsp1800 }, { "microblazeel", "petalogix-ml605", "", "TT", sizeof(kernel_plml605), kernel_plml605 }, - { "arm", "raspi2", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 }, + { "arm", "raspi2b", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 }, /* For hppa, force bios to output to serial by disabling graphics. */ { "hppa", "hppa", "-vga none", "SeaBIOS wants SYSTEM HALT" }, { "aarch64", "virt", "-cpu max", "TT", sizeof(kernel_aarch64), diff --git a/tests/qtest/libqos/arm-raspi2-machine.c b/tests/qtest/libqos/a= rm-raspi2-machine.c index 35bb4709a45..09ca863c103 100644 --- a/tests/qtest/libqos/arm-raspi2-machine.c +++ b/tests/qtest/libqos/arm-raspi2-machine.c @@ -42,7 +42,7 @@ static void *raspi2_get_driver(void *object, const char *= interface) return &machine->alloc; } =20 - fprintf(stderr, "%s not present in arm/raspi2\n", interface); + fprintf(stderr, "%s not present in arm/raspi2b\n", interface); g_assert_not_reached(); } =20 @@ -53,7 +53,7 @@ static QOSGraphObject *raspi2_get_device(void *obj, const= char *device) return &machine->sdhci.obj; } =20 - fprintf(stderr, "%s not present in arm/raspi2\n", device); + fprintf(stderr, "%s not present in arm/raspi2b\n", device); g_assert_not_reached(); } =20 @@ -85,8 +85,8 @@ static void *qos_create_machine_arm_raspi2(QTestState *qt= s) =20 static void raspi2_register_nodes(void) { - qos_node_create_machine("arm/raspi2", qos_create_machine_arm_raspi2); - qos_node_contains("arm/raspi2", "generic-sdhci", NULL); + qos_node_create_machine("arm/raspi2b", qos_create_machine_arm_raspi2); + qos_node_contains("arm/raspi2b", "generic-sdhci", NULL); } =20 libqos_init(raspi2_register_nodes); diff --git a/tests/unit/test-qgraph.c b/tests/unit/test-qgraph.c index f819430e2cc..334c76c8e71 100644 --- a/tests/unit/test-qgraph.c +++ b/tests/unit/test-qgraph.c @@ -21,7 +21,7 @@ #include "../qtest/libqos/qgraph_internal.h" =20 #define MACHINE_PC "x86_64/pc" -#define MACHINE_RASPI2 "arm/raspi2" +#define MACHINE_RASPI2 "arm/raspi2b" #define I440FX "i440FX-pcihost" #define PCIBUS_PC "pcibus-pc" #define SDHCI "sdhci" diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 3ae11a7a8f3..c9a930b3879 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -472,7 +472,7 @@ def do_test_arm_raspi2(self, uart_id): def test_arm_raspi2_uart0(self): """ :avocado: tags=3Darch:arm - :avocado: tags=3Dmachine:raspi2 + :avocado: tags=3Dmachine:raspi2b :avocado: tags=3Ddevice:pl011 :avocado: tags=3Daccel:tcg """ @@ -481,7 +481,7 @@ def test_arm_raspi2_uart0(self): def test_arm_raspi2_initrd(self): """ :avocado: tags=3Darch:arm - :avocado: tags=3Dmachine:raspi2 + :avocado: tags=3Dmachine:raspi2b """ deb_url =3D ('http://archive.raspberrypi.org/debian/' 'pool/main/r/raspberrypi-firmware/' @@ -967,7 +967,7 @@ def test_arm_orangepi_uboot_netbsd9(self): def test_aarch64_raspi3_atf(self): """ :avocado: tags=3Darch:aarch64 - :avocado: tags=3Dmachine:raspi3 + :avocado: tags=3Dmachine:raspi3b :avocado: tags=3Dcpu:cortex-a53 :avocado: tags=3Ddevice:pl011 :avocado: tags=3Datf --=20 2.31.1 From nobody Wed May 15 19:10:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625756126; cv=none; d=zohomail.com; s=zohoarc; b=nvZtUGtzT86vH4BzcNa5cWcNgBn8//LtPNEnXAdJgO38A9D9GZEaEKxaJfUwg++txrjrDvmsqJ+TtBOKby+ot0Ql7946BDJVeawuftEm1v0FT5BPA0KmXZ2bhpKwo+AL1BPXRLFtFjtM4sV6Hu0Q+2Bac8XrOOj5lnWARcIW7W8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625756126; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=scw2wo0mPwJC6QGG0i72m5GJBT0VX1Nv3M7vQANUqmY=; b=OjIdYlpTgpakLzPEjdg74YWOniE9MStytX+C6wPO5xO2g10LZcu5mmIgdE+7B07r4xGvIWsrJwkpl1JceaUnvO8Fgq0zXr5nXMPF/w2ECV7IX96XiF5WZGdTxex1TpAwUC6nH80haGRyMPbqmTZJZlfTzltaEoLYfhGvPJnTAPw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1625756126712786.9333645547041; Thu, 8 Jul 2021 07:55:26 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id k4so1605516wrc.8 for ; Thu, 08 Jul 2021 07:55:26 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id m5sm9074658wmq.2.2021.07.08.07.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 07:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=scw2wo0mPwJC6QGG0i72m5GJBT0VX1Nv3M7vQANUqmY=; b=ocBscwA6tvIiy91K/dWyI7vvH5XYwRAEmt+BZ24F3bDuM7GjZsT7/pUtZF3UirMn/x IpbUW3sjFpAzoehYVzfILSydD7IlQakGrmMpBATwXqBXPUwSwC6WLJfZHRrXvc7XEGzl p/o7bAoBJI6Jxb4zeqgD4yjf+UEmTWpe0hgfZWT6N0tFnsZn/dhQDddQIXRvY58ZClVI Mk+86dI2VyBrXxUw4o+363I8cPb3IeMCRmA5VckQ8LURgg0rKwv2rDzoCyYfKEZQyA4J K908JI4Yyb+VTRYC/Xt3R7JxZlKYAJ7+LIXuKhH2+YNM2pqOXxOlv3KuF/FYzrXQSi40 kRbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=scw2wo0mPwJC6QGG0i72m5GJBT0VX1Nv3M7vQANUqmY=; b=Y+hHHm+z/OcKUq7fmhiUo7JAwv6JnBuFlc7L96ua2tVw6ipo2+GE8CKsfzBnCXD6Yo 0ojBvPg6SrJZdk873b4x+mauiDHmfQ49tzpsaIc1+QrDBRX8yhIw67/9By0LErPurE3C 9CAxT28ws6IhY5RUdrMz7upVjavRx54N9TwEye6KWHSk7VAzM+cPqq9peOAcld5DReWw C7e/5H44GqMXRDTblMESolsqH3a3pwDjq4oYClI9bs44JOF9wEbajp4T0MTP0H5UnfdO ovD1P5dQpicz9JfYJjgY6mGB9G4UCFC0YkcqGBdsLO59TI3AegZt/dxXDqhDrd6CC4OY 8H5w== X-Gm-Message-State: AOAM5320I7iBYiZtCcC59UblUQ5sRMJl8bYteTOxErWZHbZhZPpb6r7A A2xXPfYRDHTmR4OAmR1+J4U= X-Google-Smtp-Source: ABdhPJwoA07cVfDEQ1ObnxJ5xHrnSbPP9mZSzmvBC2fPSAOkbsvihj9AQsr1b/KEFOQU8Aexv0SS3w== X-Received: by 2002:adf:e488:: with SMTP id i8mr35235594wrm.285.1625756124971; Thu, 08 Jul 2021 07:55:24 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Paolo Bonzini , Wainer dos Santos Moschetta , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases Date: Thu, 8 Jul 2021 16:55:14 +0200 Message-Id: <20210708145514.1751773-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210708145514.1751773-1-f4bug@amsat.org> References: <20210708145514.1751773-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625756128967100001 Remove the raspi2/raspi3 machine aliases, deprecated since commit 155e1c82ed0. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/system/deprecated.rst | 7 ------- docs/system/removed-features.rst | 7 +++++++ hw/arm/raspi.c | 2 -- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 70e08baff62..516a926d76a 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -207,13 +207,6 @@ this CPU is also deprecated. System emulator machines ------------------------ =20 -Raspberry Pi ``raspi2`` and ``raspi3`` machines (since 5.2) -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -The Raspberry Pi machines come in various models (A, A+, B, B+). To be able -to distinguish which model QEMU is implementing, the ``raspi2`` and ``rasp= i3`` -machines have been renamed ``raspi2b`` and ``raspi3b``. - Aspeed ``swift-bmc`` machine (since 6.1) '''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index 2b21bd39ab9..d6fe2899933 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -349,6 +349,13 @@ This machine has been renamed ``fuloong2e``. These machine types were very old and likely could not be used for live migration from old QEMU versions anymore. Use a newer machine type instead. =20 +Raspberry Pi ``raspi2`` and ``raspi3`` machines (removed in 6.1) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +The Raspberry Pi machines come in various models (A, A+, B, B+). To be able +to distinguish which model QEMU is implementing, the ``raspi2`` and ``rasp= i3`` +machines have been renamed ``raspi2b`` and ``raspi3b``. + =20 linux-user mode CPUs -------------------- diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index b30a17871f7..533bfb8cbce 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -340,7 +340,6 @@ static void raspi2b_machine_class_init(ObjectClass *oc,= void *data) MachineClass *mc =3D MACHINE_CLASS(oc); RaspiMachineClass *rmc =3D RASPI_MACHINE_CLASS(oc); =20 - mc->alias =3D "raspi2"; rmc->board_rev =3D 0xa21041; raspi_machine_class_common_init(mc, rmc->board_rev); }; @@ -360,7 +359,6 @@ static void raspi3b_machine_class_init(ObjectClass *oc,= void *data) MachineClass *mc =3D MACHINE_CLASS(oc); RaspiMachineClass *rmc =3D RASPI_MACHINE_CLASS(oc); =20 - mc->alias =3D "raspi3"; rmc->board_rev =3D 0xa02082; raspi_machine_class_common_init(mc, rmc->board_rev); }; --=20 2.31.1