1. Patchew
  2. Libvirt
  3. [PATCH 00/31] qemu: Improve handling of architecture-specific defaults (USB and PCI)
  4. View patch

[PATCH 10/31] tests: Use realview-eb instead of realview-pbx-a9

Andrea Bolognani via Devel posted 31 patches 2 weeks, 5 days ago
[PATCH 10/31] tests: Use realview-eb instead of realview-pbx-a9
Posted by Andrea Bolognani via Devel 2 weeks, 5 days ago 
QEMU implements 4 different "realview" machine types:

  $ qemu-system-aarch64 -machine help 2>&1 | grep realview
  realview-eb          ARM RealView Emulation Baseboard (ARM926EJ-S)
  realview-eb-mpcore   ARM RealView Emulation Baseboard (ARM11MPCore)
  realview-pb-a8       ARM RealView Platform Baseboard for Cortex-A8
  realview-pbx-a9      ARM RealView Platform Baseboard Explore for Cortex-A9

Of these, only the -eb variants support PCI devices and are
thus relevant when it comes to USB controllers.

Our logic treats all these machine types the same, which is
incorrect. An upcoming commit will fix the issue; in
preparation for that, make some adjustments to the test suite.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 .../aarch64-realview-minimal.aarch64-latest.abi-update.args     | 2 +-
 .../aarch64-realview-minimal.aarch64-latest.abi-update.xml      | 2 +-
 .../aarch64-realview-minimal.aarch64-latest.args                | 2 +-
 .../qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.xml | 2 +-
 tests/qemuxmlconfdata/aarch64-realview-minimal.xml              | 2 +-
 .../usb-controller-automatic-realview.aarch64-latest.args       | 2 +-
 .../usb-controller-automatic-realview.aarch64-latest.xml        | 2 +-
 tests/qemuxmlconfdata/usb-controller-automatic-realview.xml     | 2 +-
 ...controller-automatic-unavailable-realview.aarch64-latest.xml | 2 +-
 ...usb-controller-default-fallback-realview.aarch64-latest.args | 2 +-
 .../usb-controller-default-fallback-realview.aarch64-latest.xml | 2 +-
 .../usb-controller-default-realview.aarch64-latest.args         | 2 +-
 .../usb-controller-default-realview.aarch64-latest.xml          | 2 +-
 tests/qemuxmlconfdata/usb-controller-default-realview.xml       | 2 +-
 ...b-controller-default-unavailable-realview.aarch64-latest.xml | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.args
index 84a88aad58..fc88d9cf6b 100644
--- a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
--machine realview-pbx-a9,usb=off,dump-guest-core=off \
+-machine realview-eb,usb=off,dump-guest-core=off \
 -accel kvm \
 -cpu host \
 -m size=1048576k \
diff --git a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.xml
index de44852e4e..b16454b94c 100644
--- a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.xml
+++ b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='realview-pbx-a9'>hvm</type>
+    <type arch='aarch64' machine='realview-eb'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='host-passthrough' check='none'/>
diff --git a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.args
index 84a88aad58..fc88d9cf6b 100644
--- a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
--machine realview-pbx-a9,usb=off,dump-guest-core=off \
+-machine realview-eb,usb=off,dump-guest-core=off \
 -accel kvm \
 -cpu host \
 -m size=1048576k \
diff --git a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.xml
index de44852e4e..b16454b94c 100644
--- a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='realview-pbx-a9'>hvm</type>
+    <type arch='aarch64' machine='realview-eb'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='host-passthrough' check='none'/>
diff --git a/tests/qemuxmlconfdata/aarch64-realview-minimal.xml b/tests/qemuxmlconfdata/aarch64-realview-minimal.xml
index 2502e5d795..7362ad46b8 100644
--- a/tests/qemuxmlconfdata/aarch64-realview-minimal.xml
+++ b/tests/qemuxmlconfdata/aarch64-realview-minimal.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='realview-pbx-a9'>hvm</type>
+    <type arch='aarch64' machine='realview-eb'>hvm</type>
   </os>
   <cpu mode='host-passthrough'/>
   <devices>
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch64-latest.args
index 84a88aad58..fc88d9cf6b 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
--machine realview-pbx-a9,usb=off,dump-guest-core=off \
+-machine realview-eb,usb=off,dump-guest-core=off \
 -accel kvm \
 -cpu host \
 -m size=1048576k \
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch64-latest.xml
index 372d5bda6a..dc32fd50cd 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='realview-pbx-a9'>hvm</type>
+    <type arch='aarch64' machine='realview-eb'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='host-passthrough' check='none'/>
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-realview.xml b/tests/qemuxmlconfdata/usb-controller-automatic-realview.xml
index b58b207299..0814d9bd62 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-realview.xml
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-realview.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='realview-pbx-a9'>hvm</type>
+    <type arch='aarch64' machine='realview-eb'>hvm</type>
   </os>
   <cpu mode='host-passthrough'/>
   <devices>
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-realview.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-realview.aarch64-latest.xml
index dfa8ef8dbe..9da9abaa88 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-realview.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-realview.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='realview-pbx-a9'>hvm</type>
+    <type arch='aarch64' machine='realview-eb'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='host-passthrough' check='none'/>
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.args
index 446ca8aa42..604c5ec473 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
--machine realview-pbx-a9,usb=off,dump-guest-core=off \
+-machine realview-eb,usb=off,dump-guest-core=off \
 -accel kvm \
 -cpu host \
 -m size=1048576k \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.xml
index f37501b769..f61322ddb5 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='realview-pbx-a9'>hvm</type>
+    <type arch='aarch64' machine='realview-eb'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='host-passthrough' check='none'/>
diff --git a/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.args
index 446ca8aa42..604c5ec473 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \
--machine realview-pbx-a9,usb=off,dump-guest-core=off \
+-machine realview-eb,usb=off,dump-guest-core=off \
 -accel kvm \
 -cpu host \
 -m size=1048576k \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.xml
index f37501b769..f61322ddb5 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='realview-pbx-a9'>hvm</type>
+    <type arch='aarch64' machine='realview-eb'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='host-passthrough' check='none'/>
diff --git a/tests/qemuxmlconfdata/usb-controller-default-realview.xml b/tests/qemuxmlconfdata/usb-controller-default-realview.xml
index 8068d29515..5e5aae7f06 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-realview.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-realview.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='realview-pbx-a9'>hvm</type>
+    <type arch='aarch64' machine='realview-eb'>hvm</type>
   </os>
   <cpu mode='host-passthrough'/>
   <devices>
diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-realview.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-realview.aarch64-latest.xml
index dfa8ef8dbe..9da9abaa88 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-realview.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-realview.aarch64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='realview-pbx-a9'>hvm</type>
+    <type arch='aarch64' machine='realview-eb'>hvm</type>
     <boot dev='hd'/>
   </os>
   <cpu mode='host-passthrough' check='none'/>
-- 
2.50.1

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.