From 163e6662042a853b448802bb195504dca49d7bbe Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 5 Jul 2025 20:21:51 +0100 Subject: [PATCH] meson: call qemu with -machine virt on aarch64 'qemu-system-aarch64 -device help' fails when no machine is specified. Use the 'virt' type which seems to be what everyone uses for VMs. --- test/integration-tests/TEST-64-UDEV-STORAGE/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build b/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build index 76b0ebeb87d..0b1b3d9a97f 100644 --- a/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build +++ b/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build @@ -7,7 +7,10 @@ udev_storage_test_template = { } qemu = find_program('qemu-system-@0@'.format(host_machine.cpu_family()), 'qemu-kvm', dirs : ['/usr/libexec'], native : true, required : false) -if qemu.found() +if qemu.found() and host_machine.cpu_family() == 'aarch64' + # qemu-system-aarch64 errors out if no machine is specified + devices = run_command(qemu, '-device', 'help', '-machine', 'virt', check : true).stdout().strip() +elif qemu.found() devices = run_command(qemu, '-device', 'help', check : true).stdout().strip() else devices = '' -- 2.47.3