Skip to contentSkip to conversation

tests/qtest: Do not use versioned pc-q35-5.2 machine anymore

PATCH Applied Stefan Hajnoczi 6 participants 7 messages Aug 11 – Aug 12

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/qtest: Do not use versioned pc-q35-5.2 machine anymore

As of QEMU v11.1.0, the v5.2.0 machines are not usable anymore.

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

  $ qemu-system-x86_64 -M pc-q35-5.2
  qemu-system-x86_64: unsupported machine type: "pc-q35-5.2"
  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.

This commit message is taken from commit 9eef3854d309 ("tests/qtest: Do not use versioned pc-q35-5.0 machine anymore") by Philippe Mathieu-Daudé <[email protected]>.

Cc Philippe Mathieu-Daudé <[email protected]>
---
 tests/qtest/fuzz-virtio-scsi-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qtest/fuzz-virtio-scsi-test.c +1 -1
index e37b48b2cc1..102a5ccb67e 100644
@@ -19,7 +19,7 @@ static void test_mmio_oob_from_memory_region_cache(void)
 {
     QTestState *s;
 
-    s = qtest_init("-M pc-q35-5.2 -m 512M "
+    s = qtest_init("-M q35 -m 512M "
                    "-device virtio-scsi,num_queues=8,addr=03.0 ");
 
     qtest_outl(s, 0xcf8, 0x80001811);
Signature · 1 line
2.55.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 18 lines · Stefan Hajnoczi

As of QEMU v11.1.0, the v5.2.0 machines are not usable anymore.

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

  $ qemu-system-x86_64 -M pc-q35-5.2
  qemu-system-x86_64: unsupported machine type: "pc-q35-5.2"
  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.

This commit message is taken from commit 9eef3854d309 ("tests/qtest: Do not use versioned pc-q35-5.0 machine anymore") by Philippe Mathieu-Daudé <[email protected]>.

Quoted 6 lines
Cc Philippe Mathieu-Daudé <[email protected]>
---
 tests/qtest/fuzz-virtio-scsi-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

thanks
-- PMM

Reviewed-by on v1 1/1
#2 lore raw
In reply to Stefan Hajnoczi
Quoted 17 lines · Stefan Hajnoczi

As of QEMU v11.1.0, the v5.2.0 machines are not usable anymore.

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

  $ qemu-system-x86_64 -M pc-q35-5.2
  qemu-system-x86_64: unsupported machine type: "pc-q35-5.2"
  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.

This commit message is taken from commit 9eef3854d309 ("tests/qtest: Do not use versioned pc-q35-5.0 machine anymore") by Philippe Mathieu-Daudé <[email protected]>.

Quoted 5 lines
Cc Philippe Mathieu-Daudé <[email protected]>
---
 tests/qtest/fuzz-virtio-scsi-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

With regards,
Daniel

Signature · 3 lines
|: https://berrange.com       ~~        https://hachyderm.io/@berrange :|
|: https://libvirt.org          ~~          https://entangle-photo.org :|
|: https://pixelfed.art/berrange   ~~    https://fstop138.berrange.com :|
author Applied
#3 lore raw
In reply to Stefan Hajnoczi
Quoted 17 lines · Stefan Hajnoczi

As of QEMU v11.1.0, the v5.2.0 machines are not usable anymore.

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

  $ qemu-system-x86_64 -M pc-q35-5.2
  qemu-system-x86_64: unsupported machine type: "pc-q35-5.2"
  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.

This commit message is taken from commit 9eef3854d309 ("tests/qtest: Do not use versioned pc-q35-5.0 machine anymore") by Philippe Mathieu-Daudé <[email protected]>.

Quoted 5 lines
Cc Philippe Mathieu-Daudé <[email protected]>
---
 tests/qtest/fuzz-virtio-scsi-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Thanks, applied to my staging tree:
https://gitlab.com/stefanha/qemu/commits/staging

Stefan

Reviewed-by on v1 1/1
#4 lore raw
In reply to Stefan Hajnoczi
Quoted 17 lines · Stefan Hajnoczi

As of QEMU v11.1.0, the v5.2.0 machines are not usable anymore.

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

   $ qemu-system-x86_64 -M pc-q35-5.2
   qemu-system-x86_64: unsupported machine type: "pc-q35-5.2"
   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.

This commit message is taken from commit 9eef3854d309 ("tests/qtest: Do not use versioned pc-q35-5.0 machine anymore") by Philippe Mathieu-Daudé <[email protected]>.

Quoted 5 lines
Cc Philippe Mathieu-Daudé <[email protected]>
---
  tests/qtest/fuzz-virtio-scsi-test.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
#5 lore raw
In reply to Stefan Hajnoczi
Quoted 28 lines · Stefan Hajnoczi

As of QEMU v11.1.0, the v5.2.0 machines are not usable anymore.

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

   $ qemu-system-x86_64 -M pc-q35-5.2
   qemu-system-x86_64: unsupported machine type: "pc-q35-5.2"
   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.

This commit message is taken from commit 9eef3854d309 ("tests/qtest: Do not use versioned pc-q35-5.0 machine anymore") by Philippe Mathieu-Daudé <[email protected]>.

Cc Philippe Mathieu-Daudé <[email protected]>
---
  tests/qtest/fuzz-virtio-scsi-test.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
tests/qtest/fuzz-virtio-scsi-test.c +0 -0
index e37b48b2cc1..102a5ccb67e 100644

tests/qtest/fuzz-virtio-scsi-test.c static void test_mmio_oob_from_memory_region_cache(void) · line 25

Quoted 8 lines
tests/qtest/fuzz-virtio-scsi-test.c +1 -1
@@ -19,7 +19,7 @@ static void test_mmio_oob_from_memory_region_cache(void)
  {
      QTestState *s;
 
-    s = qtest_init("-M pc-q35-5.2 -m 512M "
+    s = qtest_init("-M q35 -m 512M "
                     "-device virtio-scsi,num_queues=8,addr=03.0 ");
 
      qtest_outl(s, 0xcf8, 0x80001811);

I wonder whether we should rather remove the test completely instead? Those tests based on the fuzzers rely on a certain way of doing their MMIO - if a newer machine type has a slightly different MMIO layout, the test basically does not test anything useful anymore. WDYT?

Thomas

#6 lore raw
Quoted 37 lines · Thomas Huth
Quoted 35 lines · Stefan Hajnoczi

As of QEMU v11.1.0, the v5.2.0 machines are not usable anymore.

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

   $ qemu-system-x86_64 -M pc-q35-5.2
   qemu-system-x86_64: unsupported machine type: "pc-q35-5.2"
   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.

This commit message is taken from commit 9eef3854d309 ("tests/qtest: Do not use versioned pc-q35-5.0 machine anymore") by Philippe Mathieu-Daudé <[email protected]>.

Cc Philippe Mathieu-Daudé <[email protected]>
---
  tests/qtest/fuzz-virtio-scsi-test.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
tests/qtest/fuzz-virtio-scsi-test.c +1 -1
index e37b48b2cc1..102a5ccb67e 100644
@@ -19,7 +19,7 @@ static void test_mmio_oob_from_memory_region_cache(void)
  {
      QTestState *s;
 
-    s = qtest_init("-M pc-q35-5.2 -m 512M "
+    s = qtest_init("-M q35 -m 512M "
                     "-device virtio-scsi,num_queues=8,addr=03.0 ");
 
Quoted 6 lines

tests/qtest/fuzz-virtio-scsi-test.c static void test_mmio_oob_from_memory_region_cache(void) · line 25

Quoted 1 line
tests/qtest/fuzz-virtio-scsi-test.c +0 -0
      qtest_outl(s, 0xcf8, 0x80001811);

I wonder whether we should rather remove the test completely instead? Those tests based on the fuzzers rely on a certain way of doing their MMIO - if a newer machine type has a slightly different MMIO layout, the test basically does not test anything useful anymore. WDYT?

It is likely that these hardcoded MMIO registers will continue to work because q35 won't change its PCI host controller or virtio-pci register layout.

But if you feel strongly about removing it, feel free to go ahead. I'm not 100% sure either.

Stefan