tests: Use realview-eb instead of realview-pbx-a9

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>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

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 84a88aad58cb839aa507a0d16d337fb07da9ccd2..fc88d9cf6b9173d2e1c5e87d418503548496ebf6 100644 (file)
--- 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 de44852e4ef12428d549007a3179de53b5f71bde..b16454b94cdcabf195e0706be0965b0650796624 100644 (file)
--- 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 84a88aad58cb839aa507a0d16d337fb07da9ccd2..fc88d9cf6b9173d2e1c5e87d418503548496ebf6 100644 (file)
--- 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 de44852e4ef12428d549007a3179de53b5f71bde..b16454b94cdcabf195e0706be0965b0650796624 100644 (file)
--- 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 2502e5d795375eeb1ed07ea257f7c3631b204d9d..7362ad46b84db8734bb32521319649a3c5211b7c 100644 (file)
--- 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 84a88aad58cb839aa507a0d16d337fb07da9ccd2..fc88d9cf6b9173d2e1c5e87d418503548496ebf6 100644 (file)
--- 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 372d5bda6a66ad13e50243b9b37410985bd79e1d..dc32fd50cdbd9f99c60b71b32aeee0bf9f26b8a1 100644 (file)
--- 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 b58b2072991511bd11326e8cbd914d0caa564818..0814d9bd629a975dc3763638c0dacbcd8370e0f4 100644 (file)
--- 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 dfa8ef8dbeab097e882c35a429825f5318b38640..9da9abaa884bfd5bcf9c804bb8c596918f411210 100644 (file)
--- 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 446ca8aa42052ae8c6c5dbaed56411d7a1f61672..604c5ec4735c50bc97a621c25239a70aacdbdbb8 100644 (file)
--- 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 f37501b76919d46fab7799a96cdda0de3c7b3dea..f61322ddb5aba118c2f41f12101653596ed4c8fd 100644 (file)
--- 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 446ca8aa42052ae8c6c5dbaed56411d7a1f61672..604c5ec4735c50bc97a621c25239a70aacdbdbb8 100644 (file)
--- 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 f37501b76919d46fab7799a96cdda0de3c7b3dea..f61322ddb5aba118c2f41f12101653596ed4c8fd 100644 (file)
--- 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 8068d29515d26d6de7e11d056cbd73e799361f37..5e5aae7f06d07e6dda79910d09069b8630f0b2aa 100644 (file)
--- 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 dfa8ef8dbeab097e882c35a429825f5318b38640..9da9abaa884bfd5bcf9c804bb8c596918f411210 100644 (file)
--- 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'/>