qemuDomainDefAddDefaultDevices: Handle defaults for all ARM arches together

Most machine types are avaliable in all arches by qemu. This is also
true for the 'versatilepb' machine type example in the tests.

Move all the ARM architectures together so that they are handled in
sync.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index d7be544710060e9bb324abdafac79c2fbac3f644..8ff7b3a5aa8113ac8c90ea900b856cd78921f045 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4189,14 +4189,15 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
         break;
 
     case VIR_ARCH_ARMV6L:
+    case VIR_ARCH_ARMV7L:
+    case VIR_ARCH_ARMV7B:
+    case VIR_ARCH_AARCH64:
         if (STREQ(def->os.machine, "versatilepb"))
             addPCIRoot = true;
-        break;
 
-    case VIR_ARCH_ARMV7L:
-    case VIR_ARCH_AARCH64:
         if (qemuDomainIsARMVirt(def))
             addPCIeRoot = true;
+
         break;
 
     case VIR_ARCH_PPC64:
@@ -4253,7 +4254,6 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
             addPCIRoot = true;
         break;
 
-    case VIR_ARCH_ARMV7B:
     case VIR_ARCH_CRIS:
     case VIR_ARCH_ITANIUM:
     case VIR_ARCH_LM32:

diff --git a/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-latest.abi-update.xml
index 0c89217409911709b16d8500198e4506312ffa5b..2b5feaa665bc9c9192a0ead12dc40cad024a7dfa 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-latest.abi-update.xml
+++ b/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-latest.abi-update.xml
@@ -15,6 +15,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>

diff --git a/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-latest.xml
index 0c89217409911709b16d8500198e4506312ffa5b..2b5feaa665bc9c9192a0ead12dc40cad024a7dfa 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-latest.xml
+++ b/tests/qemuxmlconfdata/aarch64-versatilepb-minimal.aarch64-latest.xml
@@ -15,6 +15,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>

diff --git a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.xml b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.xml
index b2a8d254d6f924923ad7ceb1c20f58b94f48044d..2c15244cc4fbb9e7bff9321dfe6623cc4eeebf7e 100644 (file)
--- a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.xml
+++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.xml
@@ -17,6 +17,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-armv7l</emulator>
+    <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>

diff --git a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.xml b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.xml
index b2a8d254d6f924923ad7ceb1c20f58b94f48044d..2c15244cc4fbb9e7bff9321dfe6623cc4eeebf7e 100644 (file)
--- a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.xml
+++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.xml
@@ -17,6 +17,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-armv7l</emulator>
+    <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>