On Thu, May 08, 2025 at 07:59:38AM +0200, Peter Krempa wrote:
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] ...
[...]
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/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.
The information you're looking for was included in my version of the patch[1]. I'm not NACKing this one outright because the author did the work to set up an environment with QEMU 10.0 and we can probably salvage most of the contents of this patch. [1] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/MJ22... -- Andrea Bolognani / Red Hat / Virtualization