Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

wireguard: selftests: use acpi=off instead of -no-acpi for recent QEMU

QEMU 9.0 removed -no-acpi, in favor of machine properties, so update the
Makefile to use the correct QEMU invocation.

Cc: stable@vger.kernel.org
Fixes: b83fdcd9fb8a ("wireguard: selftests: use microvm on x86")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Link: https://patch.msgid.link/20240704154517.1572127-2-Jason@zx2c4.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Jason A. Donenfeld and committed by
Jakub Kicinski
2cb489eb 0c754d9d

+4 -4
+4 -4
tools/testing/selftests/wireguard/qemu/Makefile
··· 109 109 KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/arch/x86/boot/bzImage 110 110 QEMU_VPORT_RESULT := virtio-serial-device 111 111 ifeq ($(HOST_ARCH),$(ARCH)) 112 - QEMU_MACHINE := -cpu host -machine microvm,accel=kvm,pit=off,pic=off,rtc=off -no-acpi 112 + QEMU_MACHINE := -cpu host -machine microvm,accel=kvm,pit=off,pic=off,rtc=off,acpi=off 113 113 else 114 - QEMU_MACHINE := -cpu max -machine microvm -no-acpi 114 + QEMU_MACHINE := -cpu max -machine microvm,acpi=off 115 115 endif 116 116 else ifeq ($(ARCH),i686) 117 117 CHOST := i686-linux-musl ··· 120 120 KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/arch/x86/boot/bzImage 121 121 QEMU_VPORT_RESULT := virtio-serial-device 122 122 ifeq ($(subst x86_64,i686,$(HOST_ARCH)),$(ARCH)) 123 - QEMU_MACHINE := -cpu host -machine microvm,accel=kvm,pit=off,pic=off,rtc=off -no-acpi 123 + QEMU_MACHINE := -cpu host -machine microvm,accel=kvm,pit=off,pic=off,rtc=off,acpi=off 124 124 else 125 - QEMU_MACHINE := -cpu coreduo -machine microvm -no-acpi 125 + QEMU_MACHINE := -cpu coreduo -machine microvm,acpi=off 126 126 endif 127 127 else ifeq ($(ARCH),mips64) 128 128 CHOST := mips64-linux-musl