These test cases are supposed to verify GIC support works as expected, and shouldn't concern themselves with other features; we can trim them down significantly, and make them less likely to need updating after unrelated changes. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- tests/qemuxml2argvdata/aarch64-gic-default.xml | 8 ++------ tests/qemuxml2argvdata/aarch64-gic-host.xml | 2 ++ tests/qemuxml2argvdata/aarch64-gic-invalid.xml | 8 ++------ tests/qemuxml2argvdata/aarch64-gic-none-tcg.xml | 2 +- tests/qemuxml2argvdata/aarch64-gic-none.xml | 8 ++------ tests/qemuxml2argvdata/aarch64-gic-not-arm.xml | 8 ++------ tests/qemuxml2argvdata/aarch64-gic-not-virt.xml | 8 ++------ tests/qemuxml2argvdata/aarch64-gic-v2.xml | 2 ++ tests/qemuxml2argvdata/aarch64-gic-v3.xml | 2 ++ tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml | 1 + 10 files changed, 18 insertions(+), 31 deletions(-) diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.xml b/tests/qemuxml2argvdata/aarch64-gic-default.xml index b219972b3..accfbb0af 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-default.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-default.xml @@ -2,21 +2,17 @@ <name>aarch64test</name> <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='aarch64' machine='virt'>hvm</type> - <boot dev='hd'/> </os> <features> <gic/> </features> <cpu mode='host-passthrough'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.xml b/tests/qemuxml2argvdata/aarch64-gic-host.xml index b14d14281..561f6edc6 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-host.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-host.xml @@ -18,5 +18,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-invalid.xml b/tests/qemuxml2argvdata/aarch64-gic-invalid.xml index 1cf9ea88d..98566b86d 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-invalid.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-invalid.xml @@ -2,21 +2,17 @@ <name>aarch64test</name> <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='aarch64' machine='virt'>hvm</type> - <boot dev='hd'/> </os> <features> <gic version='none'/> </features> <cpu mode='host-passthrough'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.xml b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.xml index 0aa33dbec..64745f3e0 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.xml @@ -5,13 +5,13 @@ <vcpu placement='static'>1</vcpu> <os> <type arch='aarch64' machine='virt'>hvm</type> - <boot dev='hd'/> </os> <cpu mode='custom'> <model>cortex-a57</model> </cpu> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.xml b/tests/qemuxml2argvdata/aarch64-gic-none.xml index 272d0c857..302c132a3 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-none.xml @@ -2,18 +2,14 @@ <name>aarch64test</name> <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='aarch64' machine='virt'>hvm</type> - <boot dev='hd'/> </os> <cpu mode='host-passthrough'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-not-arm.xml b/tests/qemuxml2argvdata/aarch64-gic-not-arm.xml index 3b907bc41..e33bca0ef 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-not-arm.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-not-arm.xml @@ -2,21 +2,17 @@ <name>aarch64test</name> <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='ppc64' machine='pseries'>hvm</type> - <boot dev='hd'/> </os> <features> <gic/> </features> <cpu mode='host-passthrough'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-not-virt.xml b/tests/qemuxml2argvdata/aarch64-gic-not-virt.xml index 256664ed8..12148d99e 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-not-virt.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-not-virt.xml @@ -2,21 +2,17 @@ <name>aarch64test</name> <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='aarch64' machine='not-virt'>hvm</type> - <boot dev='hd'/> </os> <features> <gic/> </features> <cpu mode='host-passthrough'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.xml b/tests/qemuxml2argvdata/aarch64-gic-v2.xml index 8b9983752..f451c87b7 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v2.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-v2.xml @@ -18,5 +18,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.xml b/tests/qemuxml2argvdata/aarch64-gic-v3.xml index bde94e16c..f3a6b9283 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v3.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-v3.xml @@ -18,5 +18,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml index a0cd0b768..b97843970 100644 --- a/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml +++ b/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml @@ -20,6 +20,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> <memballoon model='none'/> </devices> </domain> -- 2.14.3