On Wed, May 07, 2025 at 16:38:38 -0700, Matthew R. Ochs via Devel wrote:
> The borzoi machine type was dropped in QEMU 9.2.0, so let's
> use a different machine type with no ACPI support and no
> implicit USB controller instead.
>
> Signed-off-by: Matthew R. Ochs <mo...@nvidia.com>
> ---
> tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err | 2 +-
> tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml | 2 +-
> .../aarch64-nousb-minimal.aarch64-latest.abi-update.args | 2 +-
> .../aarch64-nousb-minimal.aarch64-latest.abi-update.xml | 2 +-
> tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args | 2 +-
> tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml | 2 +-
> tests/qemuxmlconfdata/aarch64-nousb-minimal.xml | 2 +-
> .../usb-controller-default-fallback-nousb.aarch64-latest.args | 2 +-
> .../usb-controller-default-fallback-nousb.aarch64-latest.xml | 2 +-
> .../usb-controller-default-nousb.aarch64-latest.args | 2 +-
> .../usb-controller-default-nousb.aarch64-latest.xml | 2 +-
> tests/qemuxmlconfdata/usb-controller-default-nousb.xml | 2 +-
> ...usb-controller-default-unavailable-nousb.aarch64-latest.args | 2 +-
> .../usb-controller-default-unavailable-nousb.aarch64-latest.xml | 2 +-
> tests/qemuxmlconftest.c | 2 +-
> 15 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err
> b/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err
> index 5f379d56ce41..d10bbb1b3e05 100644
> --- a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err
> +++ b/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err
> @@ -1 +1 @@
> -unsupported configuration: machine type 'borzoi' does not support ACPI
> +unsupported configuration: machine type 'collie' does not support ACPI
> diff --git a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml
> b/tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml
> index 10dbeabd6d52..7b5528d612b6 100644
> --- a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml
> +++ b/tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml
> @@ -5,7 +5,7 @@
> <vcpu placement='static'>1</vcpu>
> <os>
> <!-- machine type doesn't matter as long as it has no ACPI -->
> - <type arch='aarch64' machine='borzoi'>hvm</type>
> + <type arch='aarch64' machine='collie'>hvm</type>
> </os>
> <features>
> <acpi/>
> 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 a3d0f7a4fcf5..24f770b92865 100644
> ---
> a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args
> +++
> b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.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 borzoi,usb=off,dump-guest-core=off \
> +-machine collie,usb=off,dump-guest-core=off \
> -accel kvm \
> -cpu host \
> -m size=1048576k \
I presume you did a s/borzoi/collie herer, without running the test
suite?
When running, the commandline would change a bit more:
+-machine collie,usb=off,dump-guest-core=off,memory-backend=strongarm.sdram \
and also this needed to be added.
+-object
'{"qom-type":"memory-backend-ram","id":"strongarm.sdram","size":1073741824}' \
Since these hunks are present in 2/2 you've probably forgot to commit
them here :)
Anyways I'll fix this.
Reviewed-by: Peter Krempa <pkre...@redhat.com>
