From nobody Tue Feb 10 03:56:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1630044505; cv=none; d=zohomail.com; s=zohoarc; b=kyYsJKjLb5BtFyDFSnDNLCfKiswEfDRLLYqmI0AeWaedN6Ut6/ICk/WjnoPwGhY7snzewKL+X16+oQUDBfyVzPg5sHfjSBg1fFqcpP50m4qbwhVk/6wJrAZ6TM9M0Oys2X6zRRTMGSRNWc5pt/7XdqFDcbMB07ItFfsBE1hz9wY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630044505; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ziFWO8bxyp588DxjruH3IANz3bOHT3oDXgNEycciQEo=; b=HA3w3KHvBa82qOKFV97C455+TM0hyRC72QZBXxFWMMKsKVPceA16pnUCG1eNxJ3B9Ap8owhc6ACou8OY3vMzU1OfU877eV4Hu50xxUj0e1TFNl2vcDKfKxNayh66JySChxtQduQ7XFePcXGqcYjfADQMZvafcrgseuJWYgCAFUg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1630044505031990.6776208786285; Thu, 26 Aug 2021 23:08:25 -0700 (PDT) Received: by mail-wm1-f44.google.com with SMTP id g135so3112274wme.5 for ; Thu, 26 Aug 2021 23:08:24 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id e9sm1900417wrd.69.2021.08.26.23.08.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 23:08:22 -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=ziFWO8bxyp588DxjruH3IANz3bOHT3oDXgNEycciQEo=; b=S9Mf4l7RiqVH+Pp1z6Y9KaQgWuQFRjbrFsKwLvHcVDabhlmDR/OtjsUOaOh5yZwRIx OjqetqH/rEpELoI3tadb74p4iT4BnY5lYXdvUvR07uVmn7yv2n8eUgBZxxqsHLwjmQ2H A9/Tu7zwr9wrlHIlJI3yoNN1PmtkgdFl5hEdNVC+w3DRgvubtitrr5qCNna4BgwzdEJ6 4QYZdqvFJYogI62vzQt3FAPMIVOb+ZuzLrh7LWTdGcyA08zhHNspGV2/t/I8BmjRnP9w TmgyuHQZ2GBxW/yWJwkOHxFTdiRs3MBBVQWPm6Mbvc2kI9Aq7TFNfKAOg28DqP5+PLH1 yBWA== 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=ziFWO8bxyp588DxjruH3IANz3bOHT3oDXgNEycciQEo=; b=kCnjfKkExGZ1S1OF999X6ddkHxdDxmQH08J93rGk5gDvTMfFtwiIiR9TEHAwdfqbCg aHyn76CBr1I3MkQycYvzSOJAycpkVORItR5jtD6HuQoNmo2V22z29lT8IMkv5si5m94c eDe1JvkiDRBBFewWp7anKaYQIgabo8p03buhDPzziCWIFPn/OFZ/YRkghAFtO5q3LzX8 Wlfb0WTjrp+QgzmWSPNbigE5qYAkEefL5w0Lj3+gcaxkzjXe4HE20v8uJM/bFFrJBIEY M3XOOgtF6i181MuVw86MS0kzCwq7G0adbSptwpw9O4K+NHi3qm/ODLu82pNbPyJHsCps gcXA== X-Gm-Message-State: AOAM532NbEDdUU42gRTfII311wcqXMWRjmsYdJHvBKaOBmfLcZj1vQlr QgfB3le3lKohhL9KSxChJ1I= X-Google-Smtp-Source: ABdhPJzVQ8Ba2mwb+NmXNb6TtaMbrJ9kvmCibmytXl9gY5jNDQ596Zhr+zgoJ0ZXxenuIIS/KOC6hw== X-Received: by 2002:a1c:9a0e:: with SMTP id c14mr15426533wme.119.1630044502882; Thu, 26 Aug 2021 23:08:22 -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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , libvir-list@redhat.com, Peter Maydell , Thomas Huth , qemu-arm@nongnu.org Subject: [PATCH v3 1/2] tests: Remove uses of deprecated raspi2/raspi3 machine names Date: Fri, 27 Aug 2021 08:08:14 +0200 Message-Id: <20210827060815.2384760-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210827060815.2384760-1-f4bug@amsat.org> References: <20210827060815.2384760-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: 1630044506808100001 Commit 155e1c82ed0 deprecated the raspi2/raspi3 machine names. Use the recommended new names: raspi2b and raspi3b. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- 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 39e293687e6..c2882c3a334 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 96849cec915..83828ba2707 100644 --- a/tests/qtest/boot-serial-test.c +++ b/tests/qtest/boot-serial-test.c @@ -173,7 +173,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 5248c8097df..0a49c0e2760 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -475,7 +475,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 """ @@ -484,7 +484,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/' @@ -971,7 +971,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