On Wed, May 07, 2025 at 16:38:46 -0700, Matthew R. Ochs via Devel wrote:
> Add xml and reply files for QEMU 10.0.0 on aarch64.
I'd prefer if the commit message commented on some of the .args changes.
See below. (I can ammend the commit message for you so that you don't
have to resend the caps dump).
Changed output xml:
- [1]
- [2] ...
> Signed-off-by: Matthew R. Ochs <mo...@nvidia.com>
> ---
> .../qemu_10.0.0-virt.aarch64.xml | 237 +
> tests/domaincapsdata/qemu_10.0.0.aarch64.xml | 237 +
> .../caps_10.0.0_aarch64.replies | 37426 ++++++++++++++++
> .../caps_10.0.0_aarch64.xml | 546 +
> ...arch64-cpu-passthrough.aarch64-latest.args | 5 +-
> .../aarch64-kvm-32-on-64.aarch64-latest.args | 5 +-
> ...usb-minimal.aarch64-latest.abi-update.args | 3 +-
> .../aarch64-nousb-minimal.aarch64-latest.args | 3 +-
> .../aarch64-virt-graphics.aarch64-latest.args | 5 +-
> ...h64-virt-headless-mmio.aarch64-latest.args | 5 +-
> .../aarch64-virt-headless.aarch64-latest.args | 5 +-
> .../aarch64-virt-virtio.aarch64-latest.args | 5 +-
> ...o-pci-manual-addresses.aarch64-latest.args | 5 +-
> .../arm-vexpressa9-basic.aarch64-latest.args | 1 -
> .../arm-vexpressa9-basic.aarch64-latest.xml | 3 -
> .../arm-vexpressa9-nodevs.aarch64-latest.args | 1 -
> .../arm-vexpressa9-nodevs.aarch64-latest.xml | 3 -
> .../arm-vexpressa9-virtio.aarch64-latest.args | 6 +-
> .../arm-vexpressa9-virtio.aarch64-latest.xml | 3 -
> .../disk-arm-virtio-sd.aarch64-latest.args | 1 -
> .../disk-arm-virtio-sd.aarch64-latest.xml | 3 -
> ...mware-auto-efi-aarch64.aarch64-latest.args | 5 +-
> ...-loader-raw.aarch64-latest.abi-update.args | 5 +-
> ...-efi-format-loader-raw.aarch64-latest.args | 5 +-
> ...i-aarch64-legacy-paths.aarch64-latest.args | 5 +-
> ...anual-efi-acpi-aarch64.aarch64-latest.args | 5 +-
> ...ual-efi-noacpi-aarch64.aarch64-latest.args | 5 +-
> .../pvpanic-pci-aarch64.aarch64-latest.args | 5 +-
> ...pci-no-address-aarch64.aarch64-latest.args | 5 +-
> ...default-fallback-nousb.aarch64-latest.args | 3 +-
> ...ntroller-default-nousb.aarch64-latest.args | 3 +-
> ...ault-unavailable-nousb.aarch64-latest.args | 3 +-
> .../virtio-iommu-aarch64.aarch64-latest.args | 5 +-
> 33 files changed, 38490 insertions(+), 72 deletions(-)
> create mode 100644 tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml
> create mode 100644 tests/domaincapsdata/qemu_10.0.0.aarch64.xml
> create mode 100644 tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies
> create mode 100644 tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml
[...]
> diff --git
> a/tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.args
> b/tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.args
> index 93220d05ba31..735a73d14de8 100644
> --- a/tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.args
> +++ b/tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.args
> @@ -28,9 +28,8 @@
> XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
> -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":"/aarch64.raw","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
> \
> --blockdev
> '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
> \
> --device
> '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x0","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}'
> \
> +-blockdev
> '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt-1-storage","read-only":false}'
> \
> +-device
> '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x0","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}'
> \
With new qemu the extra 'raw' layer for blockdev is not necessary so
this change is expected.
[1] 'raw' format blockdev driver layer is now not needed
> diff --git
> a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args
> b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args
> index 24f770b92865..9a1c6fd27671 100644
> ---
> a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args
> +++
> b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args
> @@ -10,10 +10,11 @@
> 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 collie,usb=off,dump-guest-core=off \
> +-machine collie,usb=off,dump-guest-core=off,memory-backend=strongarm.sdram \
> -accel kvm \
> -cpu host \
> -m size=1048576k \
> +-object
> '{"qom-type":"memory-backend-ram","id":"strongarm.sdram","size":1073741824}' \
Hunks like this belong to 1/2
> -overcommit mem-lock=off \
> -smp 1,sockets=1,cores=1,threads=1 \
> -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
[...]
> diff --git a/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.args
> b/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.args
> index 72d10a732e2f..254c3d69f1ea 100644
> --- a/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.args
> +++ b/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.args
> @@ -12,7 +12,6 @@
> XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
> -object
> '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-armtest/master-key.aes"}'
> \
> -machine
> vexpress-a9,usb=off,dump-guest-core=off,memory-backend=vexpress.highmem \
> -accel tcg \
> --cpu cortex-a9 \
> -m size=1048576k \
> -object
> '{"qom-type":"memory-backend-ram","id":"vexpress.highmem","size":1073741824}'
> \
> -overcommit mem-lock=off \
> diff --git a/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.xml
> b/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.xml
> index b7b6bf855054..6aaa343afd22 100644
> --- a/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.xml
> +++ b/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.xml
> @@ -12,9 +12,6 @@
> <dtb>/arm.dtb</dtb>
> <boot dev='hd'/>
> </os>
> - <cpu mode='custom' match='exact' check='none'>
> - <model fallback='forbid'>cortex-a9</model>
> - </cpu>
> <clock offset='utc'/>
> <on_poweroff>destroy</on_poweroff>
> <on_reboot>restart</on_reboot>
This one also should be mentioned, but I don't actually know the reason
for this. So if you can dig it out please reply with it and I'll ammend
the commit message.
Other than that:
Reviewed-by: Peter Krempa <pkre...@redhat.com>
