From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Sat, 5 Jul 2025 19:21:51 +0000 (+0100)
Subject: meson: call qemu with -machine virt on aarch64
X-Git-Tag: v258-rc1~162^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F38086%2Fhead;p=thirdparty%2Fsystemd.git

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.
---

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 = ''