system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-10-06 19:19:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Remove uses of deprecated raspi2/raspi3 machine names

Browse source 
Commit 155e1c82ed deprecated the raspi2/raspi3 machine names.
Use the recommended new names: raspi2b and raspi3b.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-id: 20210827060815.2384760-2-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2021-08-27 08:08:14 +02:00 committed by Peter Maydell
parent ec397e90d2
commit cd066eea60
7 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
docs/devel/qgraph.rst
View file

@ -41,7 +41,7 @@ Nodes
A node can be of four types: A node can be of four types:
- **QNODE_MACHINE**: for example ``arm/raspi2`` - **QNODE_MACHINE**: for example ``arm/raspi2b``
- **QNODE_DRIVER**: for example ``generic-sdhci`` - **QNODE_DRIVER**: for example ``generic-sdhci``
- **QNODE_INTERFACE**: for example ``sdhci`` (interface for all ``-sdhci`` - **QNODE_INTERFACE**: for example ``sdhci`` (interface for all ``-sdhci``
drivers). drivers).
@ -119,12 +119,12 @@ It is possible to troubleshoot unavailable tests by running::
# |-> dest='i440FX-pcihost' type=0 (node=0x5591421117f0) # |-> dest='i440FX-pcihost' type=0 (node=0x5591421117f0)
# src='' # src=''
# |-> dest='x86_64/pc' type=0 (node=0x559142111600) # |-> dest='x86_64/pc' type=0 (node=0x559142111600)
# |-> dest='arm/raspi2' type=0 (node=0x559142110740) # |-> dest='arm/raspi2b' type=0 (node=0x559142110740)
... ...
# } # }
# ALL QGRAPH NODES: { # ALL QGRAPH NODES: {
# name='virtio-net-tests/announce-self' type=3 cmd_line='(null)' [available] # name='virtio-net-tests/announce-self' type=3 cmd_line='(null)' [available]
# name='arm/raspi2' type=0 cmd_line='-M raspi2 ' [UNAVAILABLE] # name='arm/raspi2b' type=0 cmd_line='-M raspi2b ' [UNAVAILABLE]
... ...
# } # }
@ -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 begins 'virtio-net'. The root of the qgraph is '' and the depth first search begins
there. there.
The ``arm/raspi`` machine node is listed as "UNAVAILABLE". Although it is The ``arm/raspi2b`` machine node is listed as "UNAVAILABLE". Although it is
reachable from the root via '' -> 'arm/raspi2' the node is unavailable because reachable from the root via '' -> 'arm/raspi2b' the node is unavailable because
the QEMU binary did not list it when queried by the framework. This is expected the QEMU binary did not list it when queried by the framework. This is expected
because we used the ``qemu-system-x86_64`` binary which does not support ARM because we used the ``qemu-system-x86_64`` binary which does not support ARM
machine types. machine types.
@ -158,7 +158,7 @@ Here we continue the ``sdhci`` use case, with the following scenario:
- ``sdhci-test`` aims to test the ``read[q,w], writeq`` functions - ``sdhci-test`` aims to test the ``read[q,w], writeq`` functions
offered by the ``sdhci`` drivers. offered by the ``sdhci`` drivers.
- The current ``sdhci`` device is supported by both ``x86_64/pc`` and ``ARM`` - The current ``sdhci`` device is supported by both ``x86_64/pc`` and ``ARM``
(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 - QEMU offers 2 types of drivers: ``QSDHCI_MemoryMapped`` for ``ARM`` and
``QSDHCI_PCI`` for ``x86_64/pc``. Both implement the ``QSDHCI_PCI`` for ``x86_64/pc``. Both implement the
``read[q,w], writeq`` functions. ``read[q,w], writeq`` functions.
@ -180,11 +180,11 @@ In order to implement such scenario in qgraph, the test developer needs to:
all the pci drivers available) all the pci drivers available)
``sdhci-pci --consumes--> pci-bus`` ``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 a ``generic-sdhci`` memory mapped ``sdhci`` driver node, representing
``QSDHCI_MemoryMapped``. ``QSDHCI_MemoryMapped``.
``arm/raspi2 --contains--> generic-sdhci`` ``arm/raspi2b --contains--> generic-sdhci``
- Create the ``sdhci`` interface node. This interface offers the - Create the ``sdhci`` interface node. This interface offers the
functions that are shared by all ``sdhci`` devices. functions that are shared by all ``sdhci`` devices.
The interface is produced by ``sdhci-pci`` and ``generic-sdhci``, 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:
``sdhci-test --consumes--> sdhci`` ``sdhci-test --consumes--> sdhci``
``arm-raspi2`` machine, simplified from ``arm-raspi2b`` machine, simplified from
``tests/qtest/libqos/arm-raspi2-machine.c``:: ``tests/qtest/libqos/arm-raspi2-machine.c``::
#include "qgraph.h" #include "qgraph.h"
@ -217,7 +217,7 @@ In order to implement such scenario in qgraph, the test developer needs to:
return &machine->alloc; return &machine->alloc;
} }
fprintf(stderr, "%s not present in arm/raspi2\n", interface); fprintf(stderr, "%s not present in arm/raspi2b\n", interface);
g_assert_not_reached(); g_assert_not_reached();
} }
@ -229,7 +229,7 @@ In order to implement such scenario in qgraph, the test developer needs to:
return &machine->sdhci.obj; return &machine->sdhci.obj;
} }
fprintf(stderr, "%s not present in arm/raspi2\n", device); fprintf(stderr, "%s not present in arm/raspi2b\n", device);
g_assert_not_reached(); g_assert_not_reached();
} }
@ -253,10 +253,10 @@ In order to implement such scenario in qgraph, the test developer needs to:
static void raspi2_register_nodes(void) static void raspi2_register_nodes(void)
{ {
/* arm/raspi2 --contains--> generic-sdhci */ /* arm/raspi2b --contains--> generic-sdhci */
qos_node_create_machine("arm/raspi2", qos_node_create_machine("arm/raspi2b",
qos_create_machine_arm_raspi2); qos_create_machine_arm_raspi2);
qos_node_contains("arm/raspi2", "generic-sdhci", NULL); qos_node_contains("arm/raspi2b", "generic-sdhci", NULL);
} }
libqos_init(raspi2_register_nodes); libqos_init(raspi2_register_nodes);
@ -470,7 +470,7 @@ In the above example, all possible types of relations are created::
| |
+--produces-- + +--produces-- +
| |
arm/raspi2 --contains--> generic-sdhci arm/raspi2b --contains--> generic-sdhci
or inverting the consumes edge in consumed_by:: or inverting the consumes edge in consumed_by::
@ -486,7 +486,7 @@ or inverting the consumes edge in consumed_by::
| |
+--produces-- + +--produces-- +
| |
arm/raspi2 --contains--> generic-sdhci arm/raspi2b --contains--> generic-sdhci
Adding a new test Adding a new test
""""""""""""""""" """""""""""""""""
@ -536,7 +536,7 @@ Final graph will be like this::
| |
+--produces-- + +--produces-- +
| |
arm/raspi2 --contains--> generic-sdhci arm/raspi2b --contains--> generic-sdhci
or inverting the consumes edge in consumed_by:: or inverting the consumes edge in consumed_by::
@ -552,7 +552,7 @@ or inverting the consumes edge in consumed_by::
| |
+--produces-- + +--produces-- +
| |
arm/raspi2 --contains--> generic-sdhci arm/raspi2b --contains--> generic-sdhci
Assuming there the binary is Assuming there the binary is
``QTEST_QEMU_BINARY=./qemu-system-x86_64`` ``QTEST_QEMU_BINARY=./qemu-system-x86_64``
@ -561,7 +561,7 @@ a valid test path will be:
and for the binary ``QTEST_QEMU_BINARY=./qemu-system-arm``: and for the binary ``QTEST_QEMU_BINARY=./qemu-system-arm``:
``/arm/raspi2/generic-sdhci/sdhci/sdhci-test`` ``/arm/raspi2b/generic-sdhci/sdhci/sdhci-test``
Additional examples are also in ``test-qgraph.c`` Additional examples are also in ``test-qgraph.c``

6
tests/acceptance/boot_linux_console.py
View file

@ -475,7 +475,7 @@ def do_test_arm_raspi2(self, uart_id):
def test_arm_raspi2_uart0(self): def test_arm_raspi2_uart0(self):
""" """
:avocado: tags=arch:arm :avocado: tags=arch:arm
:avocado: tags=machine:raspi2 :avocado: tags=machine:raspi2b
:avocado: tags=device:pl011 :avocado: tags=device:pl011
:avocado: tags=accel:tcg :avocado: tags=accel:tcg
""" """
@ -484,7 +484,7 @@ def test_arm_raspi2_uart0(self):
def test_arm_raspi2_initrd(self): def test_arm_raspi2_initrd(self):
""" """
:avocado: tags=arch:arm :avocado: tags=arch:arm
:avocado: tags=machine:raspi2 :avocado: tags=machine:raspi2b
""" """
deb_url = ('http://archive.raspberrypi.org/debian/' deb_url = ('http://archive.raspberrypi.org/debian/'
'pool/main/r/raspberrypi-firmware/' 'pool/main/r/raspberrypi-firmware/'
@ -971,7 +971,7 @@ def test_arm_orangepi_uboot_netbsd9(self):
def test_aarch64_raspi3_atf(self): def test_aarch64_raspi3_atf(self):
""" """
:avocado: tags=arch:aarch64 :avocado: tags=arch:aarch64
:avocado: tags=machine:raspi3 :avocado: tags=machine:raspi3b
:avocado: tags=cpu:cortex-a53 :avocado: tags=cpu:cortex-a53
:avocado: tags=device:pl011 :avocado: tags=device:pl011
:avocado: tags=atf :avocado: tags=atf

2
tests/qtest/boot-serial-test.c
View file

@ -173,7 +173,7 @@ static testdef_t tests[] = {
sizeof(kernel_pls3adsp1800), kernel_pls3adsp1800 }, sizeof(kernel_pls3adsp1800), kernel_pls3adsp1800 },
{ "microblazeel", "petalogix-ml605", "", "TT", { "microblazeel", "petalogix-ml605", "", "TT",
sizeof(kernel_plml605), kernel_plml605 }, 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. */ /* For hppa, force bios to output to serial by disabling graphics. */
{ "hppa", "hppa", "-vga none", "SeaBIOS wants SYSTEM HALT" }, { "hppa", "hppa", "-vga none", "SeaBIOS wants SYSTEM HALT" },
{ "aarch64", "virt", "-cpu max", "TT", sizeof(kernel_aarch64), { "aarch64", "virt", "-cpu max", "TT", sizeof(kernel_aarch64),

8
tests/qtest/libqos/arm-raspi2-machine.c
View file

@ -42,7 +42,7 @@ static void *raspi2_get_driver(void *object, const char *interface)
return &machine->alloc; return &machine->alloc;
} }
fprintf(stderr, "%s not present in arm/raspi2\n", interface); fprintf(stderr, "%s not present in arm/raspi2b\n", interface);
g_assert_not_reached(); g_assert_not_reached();
} }
@ -53,7 +53,7 @@ static QOSGraphObject *raspi2_get_device(void *obj, const char *device)
return &machine->sdhci.obj; return &machine->sdhci.obj;
} }
fprintf(stderr, "%s not present in arm/raspi2\n", device); fprintf(stderr, "%s not present in arm/raspi2b\n", device);
g_assert_not_reached(); g_assert_not_reached();
} }
@ -85,8 +85,8 @@ static void *qos_create_machine_arm_raspi2(QTestState *qts)
static void raspi2_register_nodes(void) static void raspi2_register_nodes(void)
{ {
qos_node_create_machine("arm/raspi2", qos_create_machine_arm_raspi2); 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);
} }
libqos_init(raspi2_register_nodes); libqos_init(raspi2_register_nodes);

6
tests/qtest/libqos/qgraph.h
View file

@ -252,17 +252,17 @@ void qos_node_create_driver_named(const char *name, const char *qemu_name,
* This function can be useful when there are multiple devices * This function can be useful when there are multiple devices
* with the same node name contained in a machine/other node * 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: * devices, the right commands will be:
* *
* .. code:: * .. code::
* *
* qos_node_create_machine("arm/raspi2"); * qos_node_create_machine("arm/raspi2b");
* qos_node_create_driver("generic-sdhci", constructor); * qos_node_create_driver("generic-sdhci", constructor);
* // assume rest of the fields are set NULL * // assume rest of the fields are set NULL
* QOSGraphEdgeOptions op1 = { .edge_name = "emmc" }; * QOSGraphEdgeOptions op1 = { .edge_name = "emmc" };
* QOSGraphEdgeOptions op2 = { .edge_name = "sdcard" }; * QOSGraphEdgeOptions op2 = { .edge_name = "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 * Of course this also requires that the @container's get_device function
* should implement a case for "emmc" and "sdcard". * should implement a case for "emmc" and "sdcard".

2
tests/qtest/libqos/qgraph_internal.h
View file

@ -230,7 +230,7 @@ void qos_graph_foreach_test_path(QOSTestCallback fn);
/** /**
* qos_get_machine_type(): return QEMU machine type for a machine node. * qos_get_machine_type(): return QEMU machine type for a machine node.
* This function requires every machine @name to be in the form * This function requires every machine @name to be in the form
* <arch>/<machine_name>, like "arm/raspi2" or "x86_64/pc". * <arch>/<machine_name>, like "arm/raspi2b" or "x86_64/pc".
* *
* The function will validate the format and return a pointer to * The function will validate the format and return a pointer to
* @machine to <machine_name>. For example, when passed "x86_64/pc" * @machine to <machine_name>. For example, when passed "x86_64/pc"

2
tests/unit/test-qgraph.c
View file

@ -21,7 +21,7 @@
#include "../qtest/libqos/qgraph_internal.h" #include "../qtest/libqos/qgraph_internal.h"
#define MACHINE_PC "x86_64/pc" #define MACHINE_PC "x86_64/pc"
#define MACHINE_RASPI2 "arm/raspi2" #define MACHINE_RASPI2 "arm/raspi2b"
#define I440FX "i440FX-pcihost" #define I440FX "i440FX-pcihost"
#define PCIBUS_PC "pcibus-pc" #define PCIBUS_PC "pcibus-pc"
#define SDHCI "sdhci" #define SDHCI "sdhci"