* [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
@ 2021-07-08 14:55 Philippe Mathieu-Daudé
2021-07-08 14:55 ` [PATCH v2 1/2] tests: Remove uses of deprecated raspi2/raspi3 machine names Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-07-08 14:55 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Thomas Huth, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, qemu-arm, Paolo Bonzini
Since v1:
- renamed tests (Peter)
Philippe Mathieu-Daudé (2):
tests: Remove uses of deprecated raspi2/raspi3 machine names
hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
docs/devel/qgraph.rst | 38 ++++++++++++-------------
docs/system/deprecated.rst | 7 -----
docs/system/removed-features.rst | 7 +++++
tests/qtest/libqos/qgraph.h | 6 ++--
tests/qtest/libqos/qgraph_internal.h | 2 +-
hw/arm/raspi.c | 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 ++--
10 files changed, 39 insertions(+), 41 deletions(-)
--
2.31.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 1/2] tests: Remove uses of deprecated raspi2/raspi3 machine names
2021-07-08 14:55 [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases Philippe Mathieu-Daudé
@ 2021-07-08 14:55 ` Philippe Mathieu-Daudé
2021-07-08 14:55 ` [PATCH v2 2/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases Philippe Mathieu-Daudé
2021-07-09 15:33 ` [PATCH v2 0/2] " Peter Maydell
2 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-07-08 14:55 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Thomas Huth, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, qemu-arm, Paolo Bonzini
Commit 155e1c82ed0 deprecated the raspi2/raspi3 machine names.
Use the recommended new names: raspi2b and raspi3b.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
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
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_INTERFACE**: for example ``sdhci`` (interface for all ``-sdhci``
drivers).
@@ -119,12 +119,12 @@ It is possible to troubleshoot unavailable tests by running::
# |-> dest='i440FX-pcihost' type=0 (node=0x5591421117f0)
# src=''
# |-> 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: {
# 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
there.
-The ``arm/raspi`` machine node is listed as "UNAVAILABLE". Although it is
-reachable from the root via '' -> 'arm/raspi2' the node is unavailable because
+The ``arm/raspi2b`` machine node is listed as "UNAVAILABLE". Although it is
+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
because we used the ``qemu-system-x86_64`` binary which does not support ARM
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
offered by the ``sdhci`` drivers.
- 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
``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 test developer needs to:
all the pci drivers available)
``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``.
- ``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:
``sdhci-test --consumes--> sdhci``
-``arm-raspi2`` machine, simplified from
+``arm-raspi2b`` machine, simplified from
``tests/qtest/libqos/arm-raspi2-machine.c``::
#include "qgraph.h"
@@ -217,7 +217,7 @@ In order to implement such scenario in qgraph, the test developer needs to:
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();
}
@@ -229,7 +229,7 @@ In order to implement such scenario in qgraph, the test developer needs to:
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();
}
@@ -253,10 +253,10 @@ In order to implement such scenario in qgraph, the test developer needs to:
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);
}
libqos_init(raspi2_register_nodes);
@@ -470,7 +470,7 @@ In the above example, all possible types of relations are created::
|
+--produces-- +
|
- arm/raspi2 --contains--> generic-sdhci
+ arm/raspi2b --contains--> generic-sdhci
or inverting the consumes edge in consumed_by::
@@ -486,7 +486,7 @@ or inverting the consumes edge in consumed_by::
|
+--produces-- +
|
- arm/raspi2 --contains--> generic-sdhci
+ arm/raspi2b --contains--> generic-sdhci
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
or inverting the consumes edge in consumed_by::
@@ -552,7 +552,7 @@ or inverting the consumes edge in consumed_by::
|
+--produces-- +
|
- arm/raspi2 --contains--> generic-sdhci
+ arm/raspi2b --contains--> generic-sdhci
Assuming there the binary is
``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``:
-``/arm/raspi2/generic-sdhci/sdhci/sdhci-test``
+``/arm/raspi2b/generic-sdhci/sdhci/sdhci-test``
Additional examples are also in ``test-qgraph.c``
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, const 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 = { .edge_name = "emmc" };
* 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
* should implement a case for "emmc" and "sdcard".
diff --git a/tests/qtest/libqos/qgraph_internal.h b/tests/qtest/libqos/qgraph_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
- * <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
* @machine to <machine_name>. 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[] = {
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/arm-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;
}
- fprintf(stderr, "%s not present in arm/raspi2\n", interface);
+ fprintf(stderr, "%s not present in arm/raspi2b\n", interface);
g_assert_not_reached();
}
@@ -53,7 +53,7 @@ static QOSGraphObject *raspi2_get_device(void *obj, const char *device)
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();
}
@@ -85,8 +85,8 @@ static void *qos_create_machine_arm_raspi2(QTestState *qts)
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);
}
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"
#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=arch:arm
- :avocado: tags=machine:raspi2
+ :avocado: tags=machine:raspi2b
:avocado: tags=device:pl011
:avocado: tags=accel:tcg
"""
@@ -481,7 +481,7 @@ def test_arm_raspi2_uart0(self):
def test_arm_raspi2_initrd(self):
"""
:avocado: tags=arch:arm
- :avocado: tags=machine:raspi2
+ :avocado: tags=machine:raspi2b
"""
deb_url = ('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=arch:aarch64
- :avocado: tags=machine:raspi3
+ :avocado: tags=machine:raspi3b
:avocado: tags=cpu:cortex-a53
:avocado: tags=device:pl011
:avocado: tags=atf
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
2021-07-08 14:55 [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases Philippe Mathieu-Daudé
2021-07-08 14:55 ` [PATCH v2 1/2] tests: Remove uses of deprecated raspi2/raspi3 machine names Philippe Mathieu-Daudé
@ 2021-07-08 14:55 ` Philippe Mathieu-Daudé
2021-07-09 15:33 ` [PATCH v2 0/2] " Peter Maydell
2 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-07-08 14:55 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Thomas Huth, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, qemu-arm, Paolo Bonzini
Remove the raspi2/raspi3 machine aliases,
deprecated since commit 155e1c82ed0.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
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
------------------------
-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 ``raspi3``
-machines have been renamed ``raspi2b`` and ``raspi3b``.
-
Aspeed ``swift-bmc`` machine (since 6.1)
''''''''''''''''''''''''''''''''''''''''
diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.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.
+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 ``raspi3``
+machines have been renamed ``raspi2b`` and ``raspi3b``.
+
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 = MACHINE_CLASS(oc);
RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
- mc->alias = "raspi2";
rmc->board_rev = 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 = MACHINE_CLASS(oc);
RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
- mc->alias = "raspi3";
rmc->board_rev = 0xa02082;
raspi_machine_class_common_init(mc, rmc->board_rev);
};
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
2021-07-08 14:55 [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases Philippe Mathieu-Daudé
2021-07-08 14:55 ` [PATCH v2 1/2] tests: Remove uses of deprecated raspi2/raspi3 machine names Philippe Mathieu-Daudé
2021-07-08 14:55 ` [PATCH v2 2/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases Philippe Mathieu-Daudé
@ 2021-07-09 15:33 ` Peter Maydell
2021-07-09 16:00 ` Peter Maydell
2 siblings, 1 reply; 10+ messages in thread
From: Peter Maydell @ 2021-07-09 15:33 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Paolo Bonzini, Thomas Huth, qemu-arm, QEMU Developers,
Wainer dos Santos Moschetta
On Thu, 8 Jul 2021 at 15:55, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> Since v1:
> - renamed tests (Peter)
>
> Philippe Mathieu-Daudé (2):
> tests: Remove uses of deprecated raspi2/raspi3 machine names
> hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
Applied to target-arm.next, thanks.
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
2021-07-09 15:33 ` [PATCH v2 0/2] " Peter Maydell
@ 2021-07-09 16:00 ` Peter Maydell
2021-08-26 16:49 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 10+ messages in thread
From: Peter Maydell @ 2021-07-09 16:00 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Paolo Bonzini, Thomas Huth, qemu-arm, QEMU Developers,
Wainer dos Santos Moschetta
On Fri, 9 Jul 2021 at 16:33, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> On Thu, 8 Jul 2021 at 15:55, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> >
> > Since v1:
> > - renamed tests (Peter)
> >
> > Philippe Mathieu-Daudé (2):
> > tests: Remove uses of deprecated raspi2/raspi3 machine names
> > hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
>
>
>
> Applied to target-arm.next, thanks.
I found that this seems to break 'make check':
(09/52) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd:
ERROR: Could not perform graceful shutdown (40.38 s)
Dropped from target-arm.next.
thanks
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
2021-07-09 16:00 ` Peter Maydell
@ 2021-08-26 16:49 ` Philippe Mathieu-Daudé
2021-08-27 18:01 ` Willian Rampazzo
0 siblings, 1 reply; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-08-26 16:49 UTC (permalink / raw)
To: Peter Maydell, Willian Rampazzo, John Snow
Cc: Paolo Bonzini, Thomas Huth, qemu-arm, QEMU Developers,
Wainer dos Santos Moschetta
Hi Peter,
On 7/9/21 6:00 PM, Peter Maydell wrote:
> On Fri, 9 Jul 2021 at 16:33, Peter Maydell <peter.maydell@linaro.org> wrote:
>>
>> On Thu, 8 Jul 2021 at 15:55, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>>>
>>> Since v1:
>>> - renamed tests (Peter)
>>>
>>> Philippe Mathieu-Daudé (2):
>>> tests: Remove uses of deprecated raspi2/raspi3 machine names
>>> hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
>>
>>
>>
>> Applied to target-arm.next, thanks.
>
> I found that this seems to break 'make check':
>
> (09/52) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd:
> ERROR: Could not perform graceful shutdown (40.38 s)
I can not reproduce. Maybe something got changed in Python/Avocado
since... I'm going to simply respin (updating 6.1 -> 6.2).
>
> Dropped from target-arm.next.
>
> thanks
> -- PMM
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
2021-08-26 16:49 ` Philippe Mathieu-Daudé
@ 2021-08-27 18:01 ` Willian Rampazzo
2021-08-27 18:29 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 10+ messages in thread
From: Willian Rampazzo @ 2021-08-27 18:01 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Thomas Huth, QEMU Developers,
Wainer dos Santos Moschetta, qemu-arm, Paolo Bonzini, John Snow
Hi, Phil,
On Thu, Aug 26, 2021 at 1:49 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> Hi Peter,
>
> On 7/9/21 6:00 PM, Peter Maydell wrote:
> > On Fri, 9 Jul 2021 at 16:33, Peter Maydell <peter.maydell@linaro.org> wrote:
> >>
> >> On Thu, 8 Jul 2021 at 15:55, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> >>>
> >>> Since v1:
> >>> - renamed tests (Peter)
> >>>
> >>> Philippe Mathieu-Daudé (2):
> >>> tests: Remove uses of deprecated raspi2/raspi3 machine names
> >>> hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
> >>
> >>
> >>
> >> Applied to target-arm.next, thanks.
> >
> > I found that this seems to break 'make check':
> >
> > (09/52) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd:
> > ERROR: Could not perform graceful shutdown (40.38 s)
>
> I can not reproduce. Maybe something got changed in Python/Avocado
> since... I'm going to simply respin (updating 6.1 -> 6.2).
I also could not reproduce. I checked and nothing changed on the
Avocado side. The version is still the same on the QEMU side.
>
> >
> > Dropped from target-arm.next.
> >
> > thanks
> > -- PMM
> >
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
2021-08-27 18:01 ` Willian Rampazzo
@ 2021-08-27 18:29 ` Philippe Mathieu-Daudé
2021-09-15 0:34 ` John Snow
0 siblings, 1 reply; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-08-27 18:29 UTC (permalink / raw)
To: Willian Rampazzo
Cc: Peter Maydell, Thomas Huth, QEMU Developers,
Wainer dos Santos Moschetta, qemu-arm, Paolo Bonzini, John Snow
On 8/27/21 8:01 PM, Willian Rampazzo wrote:
> Hi, Phil,
>
> On Thu, Aug 26, 2021 at 1:49 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>>
>> Hi Peter,
>>
>> On 7/9/21 6:00 PM, Peter Maydell wrote:
>>> On Fri, 9 Jul 2021 at 16:33, Peter Maydell <peter.maydell@linaro.org> wrote:
>>>>
>>>> On Thu, 8 Jul 2021 at 15:55, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>>>>>
>>>>> Since v1:
>>>>> - renamed tests (Peter)
>>>>>
>>>>> Philippe Mathieu-Daudé (2):
>>>>> tests: Remove uses of deprecated raspi2/raspi3 machine names
>>>>> hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
>>>>
>>>>
>>>>
>>>> Applied to target-arm.next, thanks.
>>>
>>> I found that this seems to break 'make check':
>>>
>>> (09/52) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd:
>>> ERROR: Could not perform graceful shutdown (40.38 s)
>>
>> I can not reproduce. Maybe something got changed in Python/Avocado
>> since... I'm going to simply respin (updating 6.1 -> 6.2).
>
> I also could not reproduce. I checked and nothing changed on the
> Avocado side. The version is still the same on the QEMU side.
Thanks for double-checking!
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
2021-08-27 18:29 ` Philippe Mathieu-Daudé
@ 2021-09-15 0:34 ` John Snow
2021-09-15 7:37 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 10+ messages in thread
From: John Snow @ 2021-09-15 0:34 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Thomas Huth, QEMU Developers,
Wainer dos Santos Moschetta, qemu-arm, Willian Rampazzo,
Paolo Bonzini
[-- Attachment #1: Type: text/plain, Size: 1610 bytes --]
On Fri, Aug 27, 2021 at 2:30 PM Philippe Mathieu-Daudé <f4bug@amsat.org>
wrote:
> On 8/27/21 8:01 PM, Willian Rampazzo wrote:
> > Hi, Phil,
> >
> > On Thu, Aug 26, 2021 at 1:49 PM Philippe Mathieu-Daudé <f4bug@amsat.org>
> wrote:
> >>
> >> Hi Peter,
> >>
> >> On 7/9/21 6:00 PM, Peter Maydell wrote:
> >>> On Fri, 9 Jul 2021 at 16:33, Peter Maydell <peter.maydell@linaro.org>
> wrote:
> >>>>
> >>>> On Thu, 8 Jul 2021 at 15:55, Philippe Mathieu-Daudé <f4bug@amsat.org>
> wrote:
> >>>>>
> >>>>> Since v1:
> >>>>> - renamed tests (Peter)
> >>>>>
> >>>>> Philippe Mathieu-Daudé (2):
> >>>>> tests: Remove uses of deprecated raspi2/raspi3 machine names
> >>>>> hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
> >>>>
> >>>>
> >>>>
> >>>> Applied to target-arm.next, thanks.
> >>>
> >>> I found that this seems to break 'make check':
> >>>
> >>> (09/52)
> tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd:
> >>> ERROR: Could not perform graceful shutdown (40.38 s)
> >>
> >> I can not reproduce. Maybe something got changed in Python/Avocado
> >> since... I'm going to simply respin (updating 6.1 -> 6.2).
> >
> > I also could not reproduce. I checked and nothing changed on the
> > Avocado side. The version is still the same on the QEMU side.
>
> Thanks for double-checking!
>
>
Sorry for the long silence.
Did you get this sorted out? I don't recall changing the QEMUMachine code
upstream lately (Though I have been tinkering with it a lot in my own
branches) -- was the root cause of the failure discovered?
--js
[-- Attachment #2: Type: text/html, Size: 2543 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
2021-09-15 0:34 ` John Snow
@ 2021-09-15 7:37 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-09-15 7:37 UTC (permalink / raw)
To: John Snow
Cc: Peter Maydell, Thomas Huth, QEMU Developers,
Wainer dos Santos Moschetta, qemu-arm, Willian Rampazzo,
Paolo Bonzini
On 9/15/21 2:34 AM, John Snow wrote:
> On Fri, Aug 27, 2021 at 2:30 PM Philippe Mathieu-Daudé <f4bug@amsat.org
> <mailto:f4bug@amsat.org>> wrote:
>
> On 8/27/21 8:01 PM, Willian Rampazzo wrote:
> > Hi, Phil,
> >
> > On Thu, Aug 26, 2021 at 1:49 PM Philippe Mathieu-Daudé
> <f4bug@amsat.org <mailto:f4bug@amsat.org>> wrote:
> >>
> >> Hi Peter,
> >>
> >> On 7/9/21 6:00 PM, Peter Maydell wrote:
> >>> On Fri, 9 Jul 2021 at 16:33, Peter Maydell
> <peter.maydell@linaro.org <mailto:peter.maydell@linaro.org>> wrote:
> >>>>
> >>>> On Thu, 8 Jul 2021 at 15:55, Philippe Mathieu-Daudé
> <f4bug@amsat.org <mailto:f4bug@amsat.org>> wrote:
> >>>>>
> >>>>> Since v1:
> >>>>> - renamed tests (Peter)
> >>>>>
> >>>>> Philippe Mathieu-Daudé (2):
> >>>>> tests: Remove uses of deprecated raspi2/raspi3 machine names
> >>>>> hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
> >>>>
> >>>>
> >>>>
> >>>> Applied to target-arm.next, thanks.
> >>>
> >>> I found that this seems to break 'make check':
> >>>
> >>> (09/52)
> tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd:
> >>> ERROR: Could not perform graceful shutdown (40.38 s)
> >>
> >> I can not reproduce. Maybe something got changed in Python/Avocado
> >> since... I'm going to simply respin (updating 6.1 -> 6.2).
> >
> > I also could not reproduce. I checked and nothing changed on the
> > Avocado side. The version is still the same on the QEMU side.
>
> Thanks for double-checking!
>
>
> Sorry for the long silence.
>
> Did you get this sorted out? I don't recall changing the QEMUMachine
> code upstream lately (Though I have been tinkering with it a lot in my
> own branches) -- was the root cause of the failure discovered?
No. Peter tested again and it passed, then this eventually got merged.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-09-15 7:40 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-08 14:55 [PATCH v2 0/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases Philippe Mathieu-Daudé
2021-07-08 14:55 ` [PATCH v2 1/2] tests: Remove uses of deprecated raspi2/raspi3 machine names Philippe Mathieu-Daudé
2021-07-08 14:55 ` [PATCH v2 2/2] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases Philippe Mathieu-Daudé
2021-07-09 15:33 ` [PATCH v2 0/2] " Peter Maydell
2021-07-09 16:00 ` Peter Maydell
2021-08-26 16:49 ` Philippe Mathieu-Daudé
2021-08-27 18:01 ` Willian Rampazzo
2021-08-27 18:29 ` Philippe Mathieu-Daudé
2021-09-15 0:34 ` John Snow
2021-09-15 7:37 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).