[PATCH 0/2] qemu: prefer GICv3 on TCG ARM VMs
Emulating ARM machines with more than 8 CPUs requires GICv3. Currently libvirt defaults to GICv2 on TCG emulated VMs. This due to a deficiency existing in QEMU in 2017. There are no issues running virtual machine with <features> <gic version='3'/> </features> using current QEMU. Heinrich Schuchardt (2): tests: use virt-6.2 for aarch64 TCG qemu: prefer GICv3 on TCG ARM VMs src/qemu/qemu_postparse.c | 14 ------- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 36 ---------------- ...efault-cpu-tcg-virt-4.2.aarch64-latest.xml | 42 ------------------- .../aarch64-default-cpu-tcg-virt-4.2.xml | 20 --------- ...fault-cpu-tcg-virt-6.2.aarch64-latest.args | 36 ++++++++++++++++ ...efault-cpu-tcg-virt-6.2.aarch64-latest.xml | 42 +++++++++++++++++++ .../aarch64-default-cpu-tcg-virt-6.2.xml | 20 +++++++++ .../aarch64-gic-none-tcg.aarch64-latest.args | 2 +- .../aarch64-gic-none-tcg.aarch64-latest.xml | 2 +- .../aarch64-pci-serial.aarch64-latest.args | 2 +- .../aarch64-pci-serial.aarch64-latest.xml | 2 +- ...arch64-traditional-pci.aarch64-latest.args | 2 +- ...aarch64-traditional-pci.aarch64-latest.xml | 2 +- ...aarch64-usb-controller.aarch64-latest.args | 2 +- .../aarch64-usb-controller.aarch64-latest.xml | 2 +- .../aarch64-video-default.aarch64-latest.args | 2 +- .../aarch64-video-default.aarch64-latest.xml | 2 +- ...4-video-virtio-gpu-pci.aarch64-latest.args | 2 +- ...64-video-virtio-gpu-pci.aarch64-latest.xml | 2 +- ...ault-models.aarch64-latest.abi-update.args | 2 +- ...fault-models.aarch64-latest.abi-update.xml | 2 +- ...64-virt-default-models.aarch64-latest.args | 2 +- ...h64-virt-default-models.aarch64-latest.xml | 2 +- ...rch64-virt-default-nic.aarch64-latest.args | 2 +- ...arch64-virt-default-nic.aarch64-latest.xml | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.xml | 2 +- ...h64-virt-headless-mmio.aarch64-latest.args | 2 +- ...ch64-virt-headless-mmio.aarch64-latest.xml | 2 +- .../aarch64-virt-headless.aarch64-latest.args | 2 +- .../aarch64-virt-headless.aarch64-latest.xml | 2 +- ...irt-minimal.aarch64-latest.abi-update.args | 2 +- ...virt-minimal.aarch64-latest.abi-update.xml | 2 +- .../aarch64-virt-minimal.aarch64-latest.args | 2 +- .../aarch64-virt-minimal.aarch64-latest.xml | 2 +- .../aarch64-virt-virtio.aarch64-latest.args | 2 +- .../aarch64-virt-virtio.aarch64-latest.xml | 2 +- ...o-pci-manual-addresses.aarch64-latest.args | 2 +- ...io-pci-manual-addresses.aarch64-latest.xml | 2 +- .../balloon-mmio-deflate.aarch64-latest.args | 2 +- .../balloon-mmio-deflate.aarch64-latest.xml | 2 +- .../cpu-topology5.aarch64-latest.args | 2 +- .../cpu-topology5.aarch64-latest.xml | 2 +- ...efi-aarch64.aarch64-latest.abi-update.args | 2 +- ...-efi-aarch64.aarch64-latest.abi-update.xml | 2 +- ...mware-auto-efi-aarch64.aarch64-latest.args | 2 +- ...rmware-auto-efi-aarch64.aarch64-latest.xml | 2 +- ...-loader-raw.aarch64-latest.abi-update.args | 2 +- ...t-loader-raw.aarch64-latest.abi-update.xml | 2 +- ...-efi-format-loader-raw.aarch64-latest.args | 2 +- ...o-efi-format-loader-raw.aarch64-latest.xml | 2 +- ...i-aarch64-legacy-paths.aarch64-latest.args | 2 +- ...fi-aarch64-legacy-paths.aarch64-latest.xml | 2 +- ...anual-efi-acpi-aarch64.aarch64-latest.args | 2 +- ...manual-efi-acpi-aarch64.aarch64-latest.xml | 2 +- ...ual-efi-noacpi-aarch64.aarch64-latest.args | 2 +- ...nual-efi-noacpi-aarch64.aarch64-latest.xml | 2 +- ...l-noefi-noacpi-aarch64.aarch64-latest.args | 2 +- ...al-noefi-noacpi-aarch64.aarch64-latest.xml | 2 +- .../iommu-smmuv3.aarch64-latest.args | 2 +- .../iommu-smmuv3.aarch64-latest.xml | 2 +- ...ch-virt-console-native.aarch64-latest.args | 2 +- ...ach-virt-console-native.aarch64-latest.xml | 2 +- ...ch-virt-console-virtio.aarch64-latest.args | 2 +- ...ach-virt-console-virtio.aarch64-latest.xml | 2 +- ...-serial+console-native.aarch64-latest.args | 2 +- ...t-serial+console-native.aarch64-latest.xml | 2 +- ...ach-virt-serial-compat.aarch64-latest.args | 2 +- ...mach-virt-serial-compat.aarch64-latest.xml | 2 +- ...ach-virt-serial-native.aarch64-latest.args | 2 +- ...mach-virt-serial-native.aarch64-latest.xml | 2 +- .../mach-virt-serial-pci.aarch64-latest.args | 2 +- .../mach-virt-serial-pci.aarch64-latest.xml | 2 +- .../mach-virt-serial-usb.aarch64-latest.args | 2 +- .../mach-virt-serial-usb.aarch64-latest.xml | 2 +- ...e-expander-bus-aarch64.aarch64-latest.args | 2 +- ...ie-expander-bus-aarch64.aarch64-latest.xml | 2 +- .../pcihole64-virt.aarch64-latest.args | 2 +- .../pcihole64-virt.aarch64-latest.xml | 2 +- .../pvpanic-pci-aarch64.aarch64-latest.args | 2 +- .../pvpanic-pci-aarch64.aarch64-latest.xml | 2 +- ...pci-no-address-aarch64.aarch64-latest.args | 2 +- ...-pci-no-address-aarch64.aarch64-latest.xml | 2 +- .../virtio-iommu-aarch64.aarch64-latest.args | 2 +- .../virtio-iommu-aarch64.aarch64-latest.xml | 2 +- tests/qemuxmlconftest.c | 2 +- 86 files changed, 177 insertions(+), 191 deletions(-) delete mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args delete mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml delete mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.xml create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.xml -- 2.48.1
virt-4.2 to virt-6.1 with default CPU do not support gic version='3' which is needed to emulate more than eight cores. virt-4.2 to virt-6.1 are deprecated as they are older than three years. Use virt-6.2 for testing. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> --- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 36 ---------------- ...efault-cpu-tcg-virt-4.2.aarch64-latest.xml | 42 ------------------- .../aarch64-default-cpu-tcg-virt-4.2.xml | 20 --------- ...fault-cpu-tcg-virt-6.2.aarch64-latest.args | 36 ++++++++++++++++ ...efault-cpu-tcg-virt-6.2.aarch64-latest.xml | 42 +++++++++++++++++++ .../aarch64-default-cpu-tcg-virt-6.2.xml | 20 +++++++++ tests/qemuxmlconftest.c | 2 +- 7 files changed, 99 insertions(+), 99 deletions(-) delete mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args delete mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml delete mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.xml create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.xml diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args deleted file mode 100644 index dc8ff2e5d9..0000000000 --- a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-guest \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=guest,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt-4.2,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ --accel tcg \ --cpu cortex-a15 \ --m size=4194304k \ --object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294967296}' \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --boot strict=on \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x0","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml deleted file mode 100644 index 1b4edaff5f..0000000000 --- a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml +++ /dev/null @@ -1,42 +0,0 @@ -<domain type='qemu'> - <name>guest</name> - <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> - <memory unit='KiB'>4194304</memory> - <currentMemory unit='KiB'>4194304</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='aarch64' machine='virt-4.2'>hvm</type> - <boot dev='hd'/> - </os> - <features> - <gic version='2'/> - </features> - <cpu mode='custom' match='exact' check='none'> - <model fallback='forbid'>cortex-a15</model> - </cpu> - <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> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='/var/lib/libvirt/images/guest.qcow2'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> - </disk> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='pci' index='1' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='1' port='0x8'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> - </controller> - <controller type='pci' index='2' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='2' port='0x9'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <audio id='1' type='none'/> - </devices> -</domain> diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.xml deleted file mode 100644 index 20ef1228ce..0000000000 --- a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.xml +++ /dev/null @@ -1,20 +0,0 @@ -<domain type='qemu'> - <name>guest</name> - <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> - <memory>4194304</memory> - <currentMemory>4194304</currentMemory> - <vcpu>1</vcpu> - <os> - <type arch='aarch64' machine='virt-4.2'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <devices> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='/var/lib/libvirt/images/guest.qcow2'/> - <target dev='vda' bus='virtio'/> - </disk> - </devices> -</domain> diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args new file mode 100644 index 0000000000..948c0aed38 --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=guest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt-6.2,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-accel tcg \ +-cpu cortex-a15 \ +-m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294967296}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x0","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml new file mode 100644 index 0000000000..d906842f11 --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml @@ -0,0 +1,42 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt-6.2'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='2'/> + </features> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>cortex-a15</model> + </cpu> + <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> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/guest.qcow2'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </disk> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='1' port='0x8'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> + </controller> + <controller type='pci' index='2' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='2' port='0x9'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <audio id='1' type='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.xml new file mode 100644 index 0000000000..18dc0f2a76 --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.xml @@ -0,0 +1,20 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory>4194304</memory> + <currentMemory>4194304</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='aarch64' machine='virt-6.2'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/guest.qcow2'/> + <target dev='vda' bus='virtio'/> + </disk> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 3f99026a31..1ed7373c50 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2903,7 +2903,7 @@ mymain(void) DO_TEST_CAPS_LATEST("cpu-Icelake-Server-pconfig"); DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-kvm-virt-4.2", "aarch64"); - DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-tcg-virt-4.2", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-tcg-virt-6.2", "aarch64"); DO_TEST_CAPS_ARCH_VER("ppc64-default-cpu-kvm-pseries-2.7", "ppc64", "7.0.0"); DO_TEST_CAPS_ARCH_VER("ppc64-default-cpu-tcg-pseries-2.7", "ppc64", "7.0.0"); DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-kvm-pseries-3.1", "ppc64"); -- 2.48.1
Emulating ARM machines with more than 8 CPUs requires GICv3. Currently libvirt defaults to GICv2 on TCG emulated VMs. This due to a deficiency existing in QEMU in 2017. There are no issues running virtual machine with <features> <gic version='3'/> </features> using current QEMU. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> --- src/qemu/qemu_postparse.c | 14 -------------- ...64-default-cpu-tcg-virt-6.2.aarch64-latest.args | 2 +- ...h64-default-cpu-tcg-virt-6.2.aarch64-latest.xml | 2 +- .../aarch64-gic-none-tcg.aarch64-latest.args | 2 +- .../aarch64-gic-none-tcg.aarch64-latest.xml | 2 +- .../aarch64-pci-serial.aarch64-latest.args | 2 +- .../aarch64-pci-serial.aarch64-latest.xml | 2 +- .../aarch64-traditional-pci.aarch64-latest.args | 2 +- .../aarch64-traditional-pci.aarch64-latest.xml | 2 +- .../aarch64-usb-controller.aarch64-latest.args | 2 +- .../aarch64-usb-controller.aarch64-latest.xml | 2 +- .../aarch64-video-default.aarch64-latest.args | 2 +- .../aarch64-video-default.aarch64-latest.xml | 2 +- ...arch64-video-virtio-gpu-pci.aarch64-latest.args | 2 +- ...aarch64-video-virtio-gpu-pci.aarch64-latest.xml | 2 +- ...t-default-models.aarch64-latest.abi-update.args | 2 +- ...rt-default-models.aarch64-latest.abi-update.xml | 2 +- ...aarch64-virt-default-models.aarch64-latest.args | 2 +- .../aarch64-virt-default-models.aarch64-latest.xml | 2 +- .../aarch64-virt-default-nic.aarch64-latest.args | 2 +- .../aarch64-virt-default-nic.aarch64-latest.xml | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.xml | 2 +- .../aarch64-virt-headless-mmio.aarch64-latest.args | 2 +- .../aarch64-virt-headless-mmio.aarch64-latest.xml | 2 +- .../aarch64-virt-headless.aarch64-latest.args | 2 +- .../aarch64-virt-headless.aarch64-latest.xml | 2 +- ...h64-virt-minimal.aarch64-latest.abi-update.args | 2 +- ...ch64-virt-minimal.aarch64-latest.abi-update.xml | 2 +- .../aarch64-virt-minimal.aarch64-latest.args | 2 +- .../aarch64-virt-minimal.aarch64-latest.xml | 2 +- .../aarch64-virt-virtio.aarch64-latest.args | 2 +- .../aarch64-virt-virtio.aarch64-latest.xml | 2 +- ...virtio-pci-manual-addresses.aarch64-latest.args | 2 +- ...-virtio-pci-manual-addresses.aarch64-latest.xml | 2 +- .../balloon-mmio-deflate.aarch64-latest.args | 2 +- .../balloon-mmio-deflate.aarch64-latest.xml | 2 +- .../cpu-topology5.aarch64-latest.args | 2 +- .../cpu-topology5.aarch64-latest.xml | 2 +- ...auto-efi-aarch64.aarch64-latest.abi-update.args | 2 +- ...-auto-efi-aarch64.aarch64-latest.abi-update.xml | 2 +- .../firmware-auto-efi-aarch64.aarch64-latest.args | 2 +- .../firmware-auto-efi-aarch64.aarch64-latest.xml | 2 +- ...ormat-loader-raw.aarch64-latest.abi-update.args | 2 +- ...format-loader-raw.aarch64-latest.abi-update.xml | 2 +- ...-auto-efi-format-loader-raw.aarch64-latest.args | 2 +- ...e-auto-efi-format-loader-raw.aarch64-latest.xml | 2 +- ...al-efi-aarch64-legacy-paths.aarch64-latest.args | 2 +- ...ual-efi-aarch64-legacy-paths.aarch64-latest.xml | 2 +- ...are-manual-efi-acpi-aarch64.aarch64-latest.args | 2 +- ...ware-manual-efi-acpi-aarch64.aarch64-latest.xml | 2 +- ...e-manual-efi-noacpi-aarch64.aarch64-latest.args | 2 +- ...re-manual-efi-noacpi-aarch64.aarch64-latest.xml | 2 +- ...manual-noefi-noacpi-aarch64.aarch64-latest.args | 2 +- ...-manual-noefi-noacpi-aarch64.aarch64-latest.xml | 2 +- .../iommu-smmuv3.aarch64-latest.args | 2 +- .../iommu-smmuv3.aarch64-latest.xml | 2 +- .../mach-virt-console-native.aarch64-latest.args | 2 +- .../mach-virt-console-native.aarch64-latest.xml | 2 +- .../mach-virt-console-virtio.aarch64-latest.args | 2 +- .../mach-virt-console-virtio.aarch64-latest.xml | 2 +- ...-virt-serial+console-native.aarch64-latest.args | 2 +- ...h-virt-serial+console-native.aarch64-latest.xml | 2 +- .../mach-virt-serial-compat.aarch64-latest.args | 2 +- .../mach-virt-serial-compat.aarch64-latest.xml | 2 +- .../mach-virt-serial-native.aarch64-latest.args | 2 +- .../mach-virt-serial-native.aarch64-latest.xml | 2 +- .../mach-virt-serial-pci.aarch64-latest.args | 2 +- .../mach-virt-serial-pci.aarch64-latest.xml | 2 +- .../mach-virt-serial-usb.aarch64-latest.args | 2 +- .../mach-virt-serial-usb.aarch64-latest.xml | 2 +- .../pcie-expander-bus-aarch64.aarch64-latest.args | 2 +- .../pcie-expander-bus-aarch64.aarch64-latest.xml | 2 +- .../pcihole64-virt.aarch64-latest.args | 2 +- .../pcihole64-virt.aarch64-latest.xml | 2 +- .../pvpanic-pci-aarch64.aarch64-latest.args | 2 +- .../pvpanic-pci-aarch64.aarch64-latest.xml | 2 +- ...anic-pci-no-address-aarch64.aarch64-latest.args | 2 +- ...panic-pci-no-address-aarch64.aarch64-latest.xml | 2 +- .../virtio-iommu-aarch64.aarch64-latest.args | 2 +- .../virtio-iommu-aarch64.aarch64-latest.xml | 2 +- 81 files changed, 80 insertions(+), 94 deletions(-) diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index 8150dffac6..7f06e8db65 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1499,20 +1499,6 @@ qemuDomainDefEnableDefaultFeatures(virDomainDef *def, version > VIR_GIC_VERSION_NONE; version--) { - /* We want to use the highest available GIC version for guests; - * however, the emulated GICv3 is currently lacking a MSI controller, - * making it unsuitable for the pure PCIe topology we aim for. - * - * For that reason, we skip this step entirely for TCG guests, - * and rely on the code below to pick the default version, GICv2, - * which supports all the features we need. - * - * See https://bugzilla.redhat.com/show_bug.cgi?id=1414081 */ - if (version == VIR_GIC_VERSION_3 && - def->virtType == VIR_DOMAIN_VIRT_QEMU) { - continue; - } - if (virQEMUCapsSupportsGICVersion(qemuCaps, def->virtType, version)) { diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args index 948c0aed38..b63b419294 100644 --- a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt-6.2,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt-6.2,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml index d906842f11..9eb2e94b9b 100644 --- a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args index 583eaa0c03..f039395015 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a57 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.xml index ab274a1ef1..e2316c723e 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>cortex-a57</model> diff --git a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args index 0ab46d3693..204dc1c477 100644 --- a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-pci-serial.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 virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.xml index fccaaa7196..5ab93a50a4 100644 --- a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args index 6d33e0d221..997ebd9a3d 100644 --- a/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.xml index ce2308d451..e6505fdf91 100644 --- a/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args index 33a989586f..cc8496d412 100644 --- a/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=219136k \ diff --git a/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.xml index 0e0f797cd5..76885b3ab8 100644 --- a/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args index 26261cae09..015789b12e 100644 --- a/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/.config \ -name guest=aarch64-vgpu,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a57 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.xml index 558b8fab3e..14ad4980eb 100644 --- a/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>cortex-a57</model> diff --git a/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args index 31f3907acc..69624638ac 100644 --- a/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/.config \ -name guest=aarch64-vgpu,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a57 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.xml index a212a28350..a8811963dd 100644 --- a/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.xml @@ -8,7 +8,7 @@ <type arch='aarch64' machine='virt'>hvm</type> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>cortex-a57</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.args index 96fb251d80..5e93b436be 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.xml index f27e7e1522..46cf4d64f3 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args index 96fb251d80..5e93b436be 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.xml index f27e7e1522..46cf4d64f3 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args index 0a8dd3e1fb..6418fac0f3 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64-virt-default/.config \ -name guest=aarch64-virt-default-nic,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64-virt-default/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a53 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.xml index 45f2464735..b300b9a8f9 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.xml @@ -12,7 +12,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>cortex-a53</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args index 1de153af00..8b292698ea 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_VARS.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml index 6f3287d52d..e2d49047eb 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml @@ -21,7 +21,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args index 285ef29f25..1f3ab6c140 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_VARS.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml index 295c14c828..98cb04e701 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml @@ -21,7 +21,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args index 99aad69a93..a20fb81a50 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_VARS.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml index 0b96654010..e5cdd924eb 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml @@ -21,7 +21,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.args index 51a196e03e..b853415395 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.xml index 25b415d390..c19aea9779 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args index 51a196e03e..b853415395 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.xml index 25b415d390..c19aea9779 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args index daf71112b5..9369f63f89 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-virtio.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 virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a53 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.xml index 347cf2ba65..a684bb0fa6 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.xml @@ -15,7 +15,7 @@ <features> <apic/> <pae/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>cortex-a53</model> diff --git a/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args index 459f90e542..daf8ffd72c 100644 --- a/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.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 virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a53 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.xml index db33608d6d..7b30ce629d 100644 --- a/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.xml @@ -15,7 +15,7 @@ <features> <apic/> <pae/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>cortex-a53</model> diff --git a/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args b/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args index 89089c9d6b..46eb274515 100644 --- a/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args +++ b/tests/qemuxmlconfdata/balloon-mmio-deflate.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 virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a53 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.xml b/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.xml index 98065d28d4..b2256a13bb 100644 --- a/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>cortex-a53</model> diff --git a/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args b/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args index d835e1c0fa..9ac92c2da1 100644 --- a/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args +++ b/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=219136k \ diff --git a/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.xml b/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.xml index 2f5645baab..4ee178f7c2 100644 --- a/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args index 3e20cb4aa5..05b118fbd1 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"qcow2","file":"libvirt-pflash0-storage","backing":null}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"qcow2","file":"libvirt-pflash1-storage","backing":null}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml index 1a9baa8cc1..acebe3034f 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args index 7bf2aeb570..cc0b3412d9 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml index 0ee421fe6f..6bc4bfb2ec 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args index 557c7eac56..5f5899519e 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml index f95e2d2465..3c72ab39ac 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args index 7bf2aeb570..cc0b3412d9 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml index 0ee421fe6f..6bc4bfb2ec 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args index 83b1ce46ab..df083a91d3 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml index 2e5c4fe584..8509fd573c 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml @@ -12,7 +12,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args index 0ebadffe99..7074e621be 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_VARS.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml index 392601c167..5b8749aeb0 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args index a7bb5c9aae..41a25c0a40 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_VARS.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=off \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml index e8289954e3..d84c673d98 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml @@ -15,7 +15,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args index 57ddaf1345..5b2156ae1b 100644 --- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml index 5deb68d4f3..b160a669b4 100644 --- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args b/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args index 007fbdb8b7..0843065367 100644 --- a/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,iommu=smmuv3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,iommu=smmuv3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.xml b/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.xml index 0314d06530..ebe961a8d1 100644 --- a/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args index 6fe6193cd7..c4d57897d5 100644 --- a/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=524288k \ diff --git a/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.xml index 66da5927e3..af692fa19c 100644 --- a/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args index 5adec09a8e..f90ace9bbd 100644 --- a/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=524288k \ diff --git a/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.xml index aede5caa3a..2c763aa5a0 100644 --- a/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.args index 6fe6193cd7..c4d57897d5 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=524288k \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.xml index 66da5927e3..af692fa19c 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args index 6fe6193cd7..c4d57897d5 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=524288k \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.xml index 66da5927e3..af692fa19c 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args index 6fe6193cd7..c4d57897d5 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=524288k \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.xml index 66da5927e3..af692fa19c 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args index bd19bf796d..02fbdd1394 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=524288k \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.xml index abf8407a72..df8465b462 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args index 7caa9c2a47..b1efe61179 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=524288k \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.xml index 9afbeee12d..a5d594a32d 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args index d9af57516c..637869f3d7 100644 --- a/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \ -name guest=pcie-expander-bus-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=2097152k \ diff --git a/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.xml index f68203f3fe..cbe4e559e6 100644 --- a/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args b/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args index d2df31ed86..a20b2a24e4 100644 --- a/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args +++ b/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -name guest=foo,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off,highmem-mmio-size=536870912K \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off,highmem-mmio-size=536870912K \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.xml b/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.xml index 1fb38b429e..141893dc5b 100644 --- a/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args index 2128de5574..f54678f6bc 100644 --- a/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-6.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-6.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml index 5cbb6ad8d4..f207ee99ea 100644 --- a/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args index 07ab2d946f..05b9e86dca 100644 --- a/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-6.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-6.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.xml index cc77b9579f..f1742a5f80 100644 --- a/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args index 4fbe7f6620..b612a49809 100644 --- a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-6.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-6.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml index 614cd2c5f5..153c1e8251 100644 --- a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> -- 2.48.1
virt-4.2 to virt-6.1 with default CPU do not support gic version='3' which is needed to emulate more than eight cores. virt-4.2 to virt-6.1 are deprecated as they are older than three years. Use virt-6.2 for testing. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> --- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 36 ---------------- ...efault-cpu-tcg-virt-4.2.aarch64-latest.xml | 42 ------------------- .../aarch64-default-cpu-tcg-virt-4.2.xml | 20 --------- ...fault-cpu-tcg-virt-6.2.aarch64-latest.args | 36 ++++++++++++++++ ...efault-cpu-tcg-virt-6.2.aarch64-latest.xml | 42 +++++++++++++++++++ .../aarch64-default-cpu-tcg-virt-6.2.xml | 20 +++++++++ tests/qemuxmlconftest.c | 2 +- 7 files changed, 99 insertions(+), 99 deletions(-) delete mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args delete mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml delete mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.xml create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.xml diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args deleted file mode 100644 index dc8ff2e5d9..0000000000 --- a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-guest \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=guest,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt-4.2,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ --accel tcg \ --cpu cortex-a15 \ --m size=4194304k \ --object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294967296}' \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --boot strict=on \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x0","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml deleted file mode 100644 index 1b4edaff5f..0000000000 --- a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml +++ /dev/null @@ -1,42 +0,0 @@ -<domain type='qemu'> - <name>guest</name> - <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> - <memory unit='KiB'>4194304</memory> - <currentMemory unit='KiB'>4194304</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='aarch64' machine='virt-4.2'>hvm</type> - <boot dev='hd'/> - </os> - <features> - <gic version='2'/> - </features> - <cpu mode='custom' match='exact' check='none'> - <model fallback='forbid'>cortex-a15</model> - </cpu> - <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> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='/var/lib/libvirt/images/guest.qcow2'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> - </disk> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='pci' index='1' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='1' port='0x8'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> - </controller> - <controller type='pci' index='2' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='2' port='0x9'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <audio id='1' type='none'/> - </devices> -</domain> diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.xml deleted file mode 100644 index 20ef1228ce..0000000000 --- a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.xml +++ /dev/null @@ -1,20 +0,0 @@ -<domain type='qemu'> - <name>guest</name> - <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> - <memory>4194304</memory> - <currentMemory>4194304</currentMemory> - <vcpu>1</vcpu> - <os> - <type arch='aarch64' machine='virt-4.2'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <devices> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='/var/lib/libvirt/images/guest.qcow2'/> - <target dev='vda' bus='virtio'/> - </disk> - </devices> -</domain> diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args new file mode 100644 index 0000000000..948c0aed38 --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=guest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt-6.2,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-accel tcg \ +-cpu cortex-a15 \ +-m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294967296}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x0","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml new file mode 100644 index 0000000000..d906842f11 --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml @@ -0,0 +1,42 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt-6.2'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='2'/> + </features> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>cortex-a15</model> + </cpu> + <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> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/guest.qcow2'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </disk> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='1' port='0x8'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> + </controller> + <controller type='pci' index='2' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='2' port='0x9'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <audio id='1' type='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.xml new file mode 100644 index 0000000000..18dc0f2a76 --- /dev/null +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.xml @@ -0,0 +1,20 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory>4194304</memory> + <currentMemory>4194304</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='aarch64' machine='virt-6.2'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/guest.qcow2'/> + <target dev='vda' bus='virtio'/> + </disk> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 3f99026a31..1ed7373c50 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2903,7 +2903,7 @@ mymain(void) DO_TEST_CAPS_LATEST("cpu-Icelake-Server-pconfig"); DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-kvm-virt-4.2", "aarch64"); - DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-tcg-virt-4.2", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-tcg-virt-6.2", "aarch64"); DO_TEST_CAPS_ARCH_VER("ppc64-default-cpu-kvm-pseries-2.7", "ppc64", "7.0.0"); DO_TEST_CAPS_ARCH_VER("ppc64-default-cpu-tcg-pseries-2.7", "ppc64", "7.0.0"); DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-kvm-pseries-3.1", "ppc64"); -- 2.48.1
Emulation ARM machines with more than 8 CPUs requires GICv3. Currently libvirt defaults to GICv2 on TCG emulated VMs. This due to a deficiency existing in QEMU in 2017. There are no issues running virtual machine with <features> <gic version='3'/> </features> using current QEMU. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> --- src/qemu/qemu_postparse.c | 14 -------------- ...64-default-cpu-tcg-virt-6.2.aarch64-latest.args | 2 +- ...h64-default-cpu-tcg-virt-6.2.aarch64-latest.xml | 2 +- .../aarch64-gic-none-tcg.aarch64-latest.args | 2 +- .../aarch64-gic-none-tcg.aarch64-latest.xml | 2 +- .../aarch64-pci-serial.aarch64-latest.args | 2 +- .../aarch64-pci-serial.aarch64-latest.xml | 2 +- .../aarch64-traditional-pci.aarch64-latest.args | 2 +- .../aarch64-traditional-pci.aarch64-latest.xml | 2 +- .../aarch64-usb-controller.aarch64-latest.args | 2 +- .../aarch64-usb-controller.aarch64-latest.xml | 2 +- .../aarch64-video-default.aarch64-latest.args | 2 +- .../aarch64-video-default.aarch64-latest.xml | 2 +- ...arch64-video-virtio-gpu-pci.aarch64-latest.args | 2 +- ...aarch64-video-virtio-gpu-pci.aarch64-latest.xml | 2 +- ...t-default-models.aarch64-latest.abi-update.args | 2 +- ...rt-default-models.aarch64-latest.abi-update.xml | 2 +- ...aarch64-virt-default-models.aarch64-latest.args | 2 +- .../aarch64-virt-default-models.aarch64-latest.xml | 2 +- .../aarch64-virt-default-nic.aarch64-latest.args | 2 +- .../aarch64-virt-default-nic.aarch64-latest.xml | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.xml | 2 +- .../aarch64-virt-headless-mmio.aarch64-latest.args | 2 +- .../aarch64-virt-headless-mmio.aarch64-latest.xml | 2 +- .../aarch64-virt-headless.aarch64-latest.args | 2 +- .../aarch64-virt-headless.aarch64-latest.xml | 2 +- ...h64-virt-minimal.aarch64-latest.abi-update.args | 2 +- ...ch64-virt-minimal.aarch64-latest.abi-update.xml | 2 +- .../aarch64-virt-minimal.aarch64-latest.args | 2 +- .../aarch64-virt-minimal.aarch64-latest.xml | 2 +- .../aarch64-virt-virtio.aarch64-latest.args | 2 +- .../aarch64-virt-virtio.aarch64-latest.xml | 2 +- ...virtio-pci-manual-addresses.aarch64-latest.args | 2 +- ...-virtio-pci-manual-addresses.aarch64-latest.xml | 2 +- .../balloon-mmio-deflate.aarch64-latest.args | 2 +- .../balloon-mmio-deflate.aarch64-latest.xml | 2 +- .../cpu-topology5.aarch64-latest.args | 2 +- .../cpu-topology5.aarch64-latest.xml | 2 +- ...auto-efi-aarch64.aarch64-latest.abi-update.args | 2 +- ...-auto-efi-aarch64.aarch64-latest.abi-update.xml | 2 +- .../firmware-auto-efi-aarch64.aarch64-latest.args | 2 +- .../firmware-auto-efi-aarch64.aarch64-latest.xml | 2 +- ...ormat-loader-raw.aarch64-latest.abi-update.args | 2 +- ...format-loader-raw.aarch64-latest.abi-update.xml | 2 +- ...-auto-efi-format-loader-raw.aarch64-latest.args | 2 +- ...e-auto-efi-format-loader-raw.aarch64-latest.xml | 2 +- ...al-efi-aarch64-legacy-paths.aarch64-latest.args | 2 +- ...ual-efi-aarch64-legacy-paths.aarch64-latest.xml | 2 +- ...are-manual-efi-acpi-aarch64.aarch64-latest.args | 2 +- ...ware-manual-efi-acpi-aarch64.aarch64-latest.xml | 2 +- ...e-manual-efi-noacpi-aarch64.aarch64-latest.args | 2 +- ...re-manual-efi-noacpi-aarch64.aarch64-latest.xml | 2 +- ...manual-noefi-noacpi-aarch64.aarch64-latest.args | 2 +- ...-manual-noefi-noacpi-aarch64.aarch64-latest.xml | 2 +- .../iommu-smmuv3.aarch64-latest.args | 2 +- .../iommu-smmuv3.aarch64-latest.xml | 2 +- .../mach-virt-console-native.aarch64-latest.args | 2 +- .../mach-virt-console-native.aarch64-latest.xml | 2 +- .../mach-virt-console-virtio.aarch64-latest.args | 2 +- .../mach-virt-console-virtio.aarch64-latest.xml | 2 +- ...-virt-serial+console-native.aarch64-latest.args | 2 +- ...h-virt-serial+console-native.aarch64-latest.xml | 2 +- .../mach-virt-serial-compat.aarch64-latest.args | 2 +- .../mach-virt-serial-compat.aarch64-latest.xml | 2 +- .../mach-virt-serial-native.aarch64-latest.args | 2 +- .../mach-virt-serial-native.aarch64-latest.xml | 2 +- .../mach-virt-serial-pci.aarch64-latest.args | 2 +- .../mach-virt-serial-pci.aarch64-latest.xml | 2 +- .../mach-virt-serial-usb.aarch64-latest.args | 2 +- .../mach-virt-serial-usb.aarch64-latest.xml | 2 +- .../pcie-expander-bus-aarch64.aarch64-latest.args | 2 +- .../pcie-expander-bus-aarch64.aarch64-latest.xml | 2 +- .../pcihole64-virt.aarch64-latest.args | 2 +- .../pcihole64-virt.aarch64-latest.xml | 2 +- .../pvpanic-pci-aarch64.aarch64-latest.args | 2 +- .../pvpanic-pci-aarch64.aarch64-latest.xml | 2 +- ...anic-pci-no-address-aarch64.aarch64-latest.args | 2 +- ...panic-pci-no-address-aarch64.aarch64-latest.xml | 2 +- .../virtio-iommu-aarch64.aarch64-latest.args | 2 +- .../virtio-iommu-aarch64.aarch64-latest.xml | 2 +- 81 files changed, 80 insertions(+), 94 deletions(-) diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index 8150dffac6..7f06e8db65 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1499,20 +1499,6 @@ qemuDomainDefEnableDefaultFeatures(virDomainDef *def, version > VIR_GIC_VERSION_NONE; version--) { - /* We want to use the highest available GIC version for guests; - * however, the emulated GICv3 is currently lacking a MSI controller, - * making it unsuitable for the pure PCIe topology we aim for. - * - * For that reason, we skip this step entirely for TCG guests, - * and rely on the code below to pick the default version, GICv2, - * which supports all the features we need. - * - * See https://bugzilla.redhat.com/show_bug.cgi?id=1414081 */ - if (version == VIR_GIC_VERSION_3 && - def->virtType == VIR_DOMAIN_VIRT_QEMU) { - continue; - } - if (virQEMUCapsSupportsGICVersion(qemuCaps, def->virtType, version)) { diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args index 948c0aed38..b63b419294 100644 --- a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt-6.2,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt-6.2,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml index d906842f11..9eb2e94b9b 100644 --- a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-6.2.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args index 583eaa0c03..f039395015 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a57 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.xml index ab274a1ef1..e2316c723e 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>cortex-a57</model> diff --git a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args index 0ab46d3693..204dc1c477 100644 --- a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-pci-serial.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 virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.xml index fccaaa7196..5ab93a50a4 100644 --- a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args index 6d33e0d221..997ebd9a3d 100644 --- a/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.xml index ce2308d451..e6505fdf91 100644 --- a/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args index 33a989586f..cc8496d412 100644 --- a/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=219136k \ diff --git a/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.xml index 0e0f797cd5..76885b3ab8 100644 --- a/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args index 26261cae09..015789b12e 100644 --- a/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/.config \ -name guest=aarch64-vgpu,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a57 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.xml index 558b8fab3e..14ad4980eb 100644 --- a/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>cortex-a57</model> diff --git a/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args index 31f3907acc..69624638ac 100644 --- a/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/.config \ -name guest=aarch64-vgpu,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a57 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.xml index a212a28350..a8811963dd 100644 --- a/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.xml @@ -8,7 +8,7 @@ <type arch='aarch64' machine='virt'>hvm</type> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>cortex-a57</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.args index 96fb251d80..5e93b436be 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.xml index f27e7e1522..46cf4d64f3 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args index 96fb251d80..5e93b436be 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.xml index f27e7e1522..46cf4d64f3 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args index 0a8dd3e1fb..6418fac0f3 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64-virt-default/.config \ -name guest=aarch64-virt-default-nic,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64-virt-default/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a53 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.xml index 45f2464735..b300b9a8f9 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.xml @@ -12,7 +12,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>cortex-a53</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args index 1de153af00..8b292698ea 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_VARS.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml index 6f3287d52d..e2d49047eb 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.xml @@ -21,7 +21,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args index 285ef29f25..1f3ab6c140 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_VARS.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml index 295c14c828..98cb04e701 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.xml @@ -21,7 +21,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args index 99aad69a93..a20fb81a50 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_VARS.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml index 0b96654010..e5cdd924eb 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.xml @@ -21,7 +21,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.args index 51a196e03e..b853415395 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.xml index 25b415d390..c19aea9779 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args index 51a196e03e..b853415395 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=4194304k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.xml index 25b415d390..c19aea9779 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args index daf71112b5..9369f63f89 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-virtio.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 virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a53 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.xml index 347cf2ba65..a684bb0fa6 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.xml @@ -15,7 +15,7 @@ <features> <apic/> <pae/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>cortex-a53</model> diff --git a/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args index 459f90e542..daf8ffd72c 100644 --- a/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.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 virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a53 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.xml b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.xml index db33608d6d..7b30ce629d 100644 --- a/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.xml @@ -15,7 +15,7 @@ <features> <apic/> <pae/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>cortex-a53</model> diff --git a/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args b/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args index 89089c9d6b..46eb274515 100644 --- a/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args +++ b/tests/qemuxmlconfdata/balloon-mmio-deflate.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 virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a53 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.xml b/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.xml index 98065d28d4..b2256a13bb 100644 --- a/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='allow'>cortex-a53</model> diff --git a/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args b/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args index d835e1c0fa..9ac92c2da1 100644 --- a/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args +++ b/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=219136k \ diff --git a/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.xml b/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.xml index 2f5645baab..4ee178f7c2 100644 --- a/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args index 3e20cb4aa5..05b118fbd1 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"qcow2","file":"libvirt-pflash0-storage","backing":null}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.qcow2","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"qcow2","file":"libvirt-pflash1-storage","backing":null}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml index 1a9baa8cc1..acebe3034f 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args index 7bf2aeb570..cc0b3412d9 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml index 0ee421fe6f..6bc4bfb2ec 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args index 557c7eac56..5f5899519e 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml index f95e2d2465..3c72ab39ac 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args index 7bf2aeb570..cc0b3412d9 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml index 0ee421fe6f..6bc4bfb2ec 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args index 83b1ce46ab..df083a91d3 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml index 2e5c4fe584..8509fd573c 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml @@ -12,7 +12,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args index 0ebadffe99..7074e621be 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_VARS.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml index 392601c167..5b8749aeb0 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args index a7bb5c9aae..41a25c0a40 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/path/to/guest_VARS.raw","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=off \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml index e8289954e3..d84c673d98 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml @@ -15,7 +15,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args index 57ddaf1345..5b2156ae1b 100644 --- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt-4.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml index 5deb68d4f3..b160a669b4 100644 --- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args b/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args index 007fbdb8b7..0843065367 100644 --- a/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,iommu=smmuv3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,iommu=smmuv3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.xml b/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.xml index 0314d06530..ebe961a8d1 100644 --- a/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args index 6fe6193cd7..c4d57897d5 100644 --- a/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=524288k \ diff --git a/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.xml index 66da5927e3..af692fa19c 100644 --- a/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args index 5adec09a8e..f90ace9bbd 100644 --- a/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=524288k \ diff --git a/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.xml index aede5caa3a..2c763aa5a0 100644 --- a/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.args index 6fe6193cd7..c4d57897d5 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=524288k \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.xml index 66da5927e3..af692fa19c 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args index 6fe6193cd7..c4d57897d5 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=524288k \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.xml index 66da5927e3..af692fa19c 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args index 6fe6193cd7..c4d57897d5 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=524288k \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.xml index 66da5927e3..af692fa19c 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args index bd19bf796d..02fbdd1394 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=524288k \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.xml index abf8407a72..df8465b462 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args index 7caa9c2a47..b1efe61179 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -name guest=guest,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=524288k \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.xml b/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.xml index 9afbeee12d..a5d594a32d 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args index d9af57516c..637869f3d7 100644 --- a/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \ -name guest=pcie-expander-bus-test,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ -accel tcg \ -cpu cortex-a15 \ -m size=2097152k \ diff --git a/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.xml index f68203f3fe..cbe4e559e6 100644 --- a/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args b/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args index d2df31ed86..a20b2a24e4 100644 --- a/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args +++ b/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -name guest=foo,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off,highmem-mmio-size=536870912K \ +-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off,highmem-mmio-size=536870912K \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.xml b/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.xml index 1fb38b429e..141893dc5b 100644 --- a/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <features> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args index 2128de5574..f54678f6bc 100644 --- a/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-6.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-6.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml index 5cbb6ad8d4..f207ee99ea 100644 --- a/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args index 07ab2d946f..05b9e86dca 100644 --- a/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-6.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-6.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.xml index cc77b9579f..f1742a5f80 100644 --- a/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> diff --git a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args index 4fbe7f6620..b612a49809 100644 --- a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ --machine virt-6.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ +-machine virt-6.0,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-storage,acpi=on \ -accel tcg \ -cpu cortex-a15 \ -m size=1048576k \ diff --git a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml index 614cd2c5f5..153c1e8251 100644 --- a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml @@ -16,7 +16,7 @@ </os> <features> <acpi/> - <gic version='2'/> + <gic version='3'/> </features> <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>cortex-a15</model> -- 2.48.1
participants (1)
-
Heinrich Schuchardt