Commit 1f2f341a authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Jakub Kicinski
Browse files

wireguard: selftests: use virt machine on m68k 



This should be a bit more stable hopefully.

Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 829be057

tools/testing/selftests/wireguard/qemu/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -208,10 +208,11 @@ QEMU_ARCH := m68k 
KERNEL_ARCH := m68k

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/vmlinux

KERNEL_CMDLINE := $(shell sed -n 's/CONFIG_CMDLINE=\(.*\)/\1/p' arch/m68k.config)

QEMU_VPORT_RESULT := virtio-serial-device

ifeq ($(HOST_ARCH),$(ARCH))

QEMU_MACHINE := -cpu host,accel=kvm -machine q800 -append $(KERNEL_CMDLINE)

QEMU_MACHINE := -cpu host,accel=kvm -machine virt -append $(KERNEL_CMDLINE)

else

QEMU_MACHINE := -machine q800 -smp 1 -append $(KERNEL_CMDLINE)

QEMU_MACHINE := -machine virt -smp 1 -append $(KERNEL_CMDLINE)

endif

else ifeq ($(ARCH),riscv64)

CHOST := riscv64-linux-musl

tools/testing/selftests/wireguard/qemu/arch/m68k.config

+3 −6
Original line number Diff line number Diff line 
CONFIG_MMU=y

CONFIG_VIRT=y

CONFIG_M68KCLASSIC=y

CONFIG_M68040=y

CONFIG_MAC=y

CONFIG_SERIAL_PMACZILOG=y

CONFIG_SERIAL_PMACZILOG_TTYS=y

CONFIG_SERIAL_PMACZILOG_CONSOLE=y

CONFIG_VIRTIO_CONSOLE=y

CONFIG_COMPAT_32BIT_TIME=y

CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1"

CONFIG_CMDLINE="console=ttyGF0 wg.success=vport0p1 panic_on_warn=1"

CONFIG_FRAME_WARN=1024