Skip to content

Commit 2cb489e

Browse files
zx2c4kuba-moo
authored andcommitted
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: [email protected] Fixes: b83fdcd ("wireguard: selftests: use microvm on x86") Signed-off-by: Jason A. Donenfeld <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 0c754d9 commit 2cb489e

File tree

1 file changed

+4
-4
lines changed
  • tools/testing/selftests/wireguard/qemu

1 file changed

+4
-4
lines changed

tools/testing/selftests/wireguard/qemu/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ KERNEL_ARCH := x86_64
109109
KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/arch/x86/boot/bzImage
110110
QEMU_VPORT_RESULT := virtio-serial-device
111111
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
113113
else
114-
QEMU_MACHINE := -cpu max -machine microvm -no-acpi
114+
QEMU_MACHINE := -cpu max -machine microvm,acpi=off
115115
endif
116116
else ifeq ($(ARCH),i686)
117117
CHOST := i686-linux-musl
@@ -120,9 +120,9 @@ KERNEL_ARCH := x86
120120
KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/arch/x86/boot/bzImage
121121
QEMU_VPORT_RESULT := virtio-serial-device
122122
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
124124
else
125-
QEMU_MACHINE := -cpu coreduo -machine microvm -no-acpi
125+
QEMU_MACHINE := -cpu coreduo -machine microvm,acpi=off
126126
endif
127127
else ifeq ($(ARCH),mips64)
128128
CHOST := mips64-linux-musl

0 commit comments

Comments
 (0)