[v1] tests/qtest: Do not use versioned pc-q35-5.0 machine anymore

[PATCH] tests/qtest: Do not use versioned pc-q35-5.0 machine anymore

Posted by Philippe Mathieu-Daudé 1 month, 2 weeks ago

As of QEMU v10.2.0, the v5.0.0 machines are not usable anymore.

Use the latest x86 q35 machine instead, otherwise we get:

  $ qemu-system-x86_64 -M pc-q35-5.0
  qemu-system-x86_64: unsupported machine type: "pc-q35-5.0"
  Use -machine help to list supported machines

See commit a35f8577a07 ("include/hw: add macros for deprecation
& removal of versioned machines") and f59ee044067 ("include/hw/boards:
cope with dev/rc versions in deprecation checks") for explanation
on automatically removed versioned machines.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
Since all builds are blocked, could we apply as build-fix on master?
---
 tests/qtest/fuzz-e1000e-test.c | 2 +-
 tests/qtest/lpc-ich9-test.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qtest/fuzz-e1000e-test.c b/tests/qtest/fuzz-e1000e-test.c
index 5052883fb6a..61f0553e9be 100644
--- a/tests/qtest/fuzz-e1000e-test.c
+++ b/tests/qtest/fuzz-e1000e-test.c
@@ -17,7 +17,7 @@ static void test_lp1879531_eth_get_rss_ex_dst_addr(void)
 {
     QTestState *s;
 
-    s = qtest_init("-nographic -monitor none -serial none -M pc-q35-5.0");
+    s = qtest_init("-nographic -monitor none -serial none -M pc-q35");
 
     qtest_outl(s, 0xcf8, 0x80001010);
     qtest_outl(s, 0xcfc, 0xe1020000);
diff --git a/tests/qtest/lpc-ich9-test.c b/tests/qtest/lpc-ich9-test.c
index 8ac95b89f72..535099226ca 100644
--- a/tests/qtest/lpc-ich9-test.c
+++ b/tests/qtest/lpc-ich9-test.c
@@ -15,7 +15,7 @@ static void test_lp1878642_pci_bus_get_irq_level_assert(void)
 {
     QTestState *s;
 
-    s = qtest_init("-M pc-q35-5.0 "
+    s = qtest_init("-M pc-q35 "
                    "-nographic -monitor none -serial none");
 
     qtest_outl(s, 0xcf8, 0x8000f840); /* PMBASE */
-- 
2.52.0

Re: [PATCH] tests/qtest: Do not use versioned pc-q35-5.0 machine anymore

Posted by Akihiko Odaki 1 month, 2 weeks ago

On 2025/12/24 6:11, Philippe Mathieu-Daudé wrote:
> As of QEMU v10.2.0, the v5.0.0 machines are not usable anymore.
> 
> Use the latest x86 q35 machine instead, otherwise we get:
> 
>    $ qemu-system-x86_64 -M pc-q35-5.0
>    qemu-system-x86_64: unsupported machine type: "pc-q35-5.0"
>    Use -machine help to list supported machines
> 
> See commit a35f8577a07 ("include/hw: add macros for deprecation
> & removal of versioned machines") and f59ee044067 ("include/hw/boards:
> cope with dev/rc versions in deprecation checks") for explanation
> on automatically removed versioned machines.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>

Re: [PATCH] tests/qtest: Do not use versioned pc-q35-5.0 machine anymore

Posted by Fabiano Rosas 1 month, 2 weeks ago

Philippe Mathieu-Daudé <philmd@linaro.org> writes:

> As of QEMU v10.2.0, the v5.0.0 machines are not usable anymore.
>
> Use the latest x86 q35 machine instead, otherwise we get:
>
>   $ qemu-system-x86_64 -M pc-q35-5.0
>   qemu-system-x86_64: unsupported machine type: "pc-q35-5.0"
>   Use -machine help to list supported machines
>
> See commit a35f8577a07 ("include/hw: add macros for deprecation
> & removal of versioned machines") and f59ee044067 ("include/hw/boards:
> cope with dev/rc versions in deprecation checks") for explanation
> on automatically removed versioned machines.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> Since all builds are blocked, could we apply as build-fix on master?
> ---
>  tests/qtest/fuzz-e1000e-test.c | 2 +-
>  tests/qtest/lpc-ich9-test.c    | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qtest/fuzz-e1000e-test.c b/tests/qtest/fuzz-e1000e-test.c
> index 5052883fb6a..61f0553e9be 100644
> --- a/tests/qtest/fuzz-e1000e-test.c
> +++ b/tests/qtest/fuzz-e1000e-test.c
> @@ -17,7 +17,7 @@ static void test_lp1879531_eth_get_rss_ex_dst_addr(void)
>  {
>      QTestState *s;
>  
> -    s = qtest_init("-nographic -monitor none -serial none -M pc-q35-5.0");
> +    s = qtest_init("-nographic -monitor none -serial none -M pc-q35");
>  
>      qtest_outl(s, 0xcf8, 0x80001010);
>      qtest_outl(s, 0xcfc, 0xe1020000);
> diff --git a/tests/qtest/lpc-ich9-test.c b/tests/qtest/lpc-ich9-test.c
> index 8ac95b89f72..535099226ca 100644
> --- a/tests/qtest/lpc-ich9-test.c
> +++ b/tests/qtest/lpc-ich9-test.c
> @@ -15,7 +15,7 @@ static void test_lp1878642_pci_bus_get_irq_level_assert(void)
>  {
>      QTestState *s;
>  
> -    s = qtest_init("-M pc-q35-5.0 "
> +    s = qtest_init("-M pc-q35 "
>                     "-nographic -monitor none -serial none");
>  
>      qtest_outl(s, 0xcf8, 0x8000f840); /* PMBASE */

Reviewed-by: Fabiano Rosas <farosas@suse.de>