From 3bd95a0dbd5215b8e095bb74883dc8a3f6c6017e Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 25 Mar 2019 13:18:59 +0100 Subject: qemu: set framewarn 1280 for 64bit and 1024 for 32bit --- src/tests/qemu/Makefile | 2 +- src/tests/qemu/arch/aarch64.config | 1 + src/tests/qemu/arch/aarch64_be.config | 1 + src/tests/qemu/arch/arm.config | 1 + src/tests/qemu/arch/armeb.config | 4 +--- src/tests/qemu/arch/i686.config | 1 + src/tests/qemu/arch/m68k.config | 1 + src/tests/qemu/arch/mips.config | 1 + src/tests/qemu/arch/mips64.config | 1 + src/tests/qemu/arch/mips64el.config | 1 + src/tests/qemu/arch/mipsel.config | 1 + src/tests/qemu/arch/powerpc.config | 1 + src/tests/qemu/arch/powerpc64le.config | 1 + src/tests/qemu/arch/x86_64.config | 1 + 14 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/tests/qemu/Makefile b/src/tests/qemu/Makefile index f2832b5..cd0d46e 100644 --- a/src/tests/qemu/Makefile +++ b/src/tests/qemu/Makefile @@ -14,7 +14,7 @@ endif ARCH := $(firstword $(subst -, ,$(CBUILD))) # Set these from the environment to override -KERNEL_VERSION ?= 4.20 +KERNEL_VERSION ?= 5.0.4 KERNEL_VERSION := $(KERNEL_VERSION)$(if $(DEBUG_KERNEL),$(if $(findstring -debug,$(KERNEL_VERSION)),,-debug),) BUILD_PATH ?= $(PWD)/../../../qemu-build/$(ARCH) DISTFILES_PATH ?= $(PWD)/distfiles diff --git a/src/tests/qemu/arch/aarch64.config b/src/tests/qemu/arch/aarch64.config index 7f46172..3d063bb 100644 --- a/src/tests/qemu/arch/aarch64.config +++ b/src/tests/qemu/arch/aarch64.config @@ -2,3 +2,4 @@ CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1" +CONFIG_FRAME_WARN=1280 diff --git a/src/tests/qemu/arch/aarch64_be.config b/src/tests/qemu/arch/aarch64_be.config index 8dc91c2..dbdc7e4 100644 --- a/src/tests/qemu/arch/aarch64_be.config +++ b/src/tests/qemu/arch/aarch64_be.config @@ -3,3 +3,4 @@ CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1" +CONFIG_FRAME_WARN=1280 diff --git a/src/tests/qemu/arch/arm.config b/src/tests/qemu/arch/arm.config index 0f39937..148f499 100644 --- a/src/tests/qemu/arch/arm.config +++ b/src/tests/qemu/arch/arm.config @@ -6,3 +6,4 @@ CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1" +CONFIG_FRAME_WARN=1024 diff --git a/src/tests/qemu/arch/armeb.config b/src/tests/qemu/arch/armeb.config index b699465..bd76b07 100644 --- a/src/tests/qemu/arch/armeb.config +++ b/src/tests/qemu/arch/armeb.config @@ -7,6 +7,4 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1" CONFIG_CPU_BIG_ENDIAN=y - -# Remove me for 4.20/5.0. This is just a dirty hack to allow CPU_BIG_ENDIAN. -CONFIG_ARCH_HIGHBANK=y +CONFIG_FRAME_WARN=1024 diff --git a/src/tests/qemu/arch/i686.config b/src/tests/qemu/arch/i686.config index ed1e701..a85025d 100644 --- a/src/tests/qemu/arch/i686.config +++ b/src/tests/qemu/arch/i686.config @@ -2,3 +2,4 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1024 diff --git a/src/tests/qemu/arch/m68k.config b/src/tests/qemu/arch/m68k.config index 07f6041..5381ea1 100644 --- a/src/tests/qemu/arch/m68k.config +++ b/src/tests/qemu/arch/m68k.config @@ -6,3 +6,4 @@ CONFIG_SERIAL_PMACZILOG_TTYS=y CONFIG_SERIAL_PMACZILOG_CONSOLE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1024 diff --git a/src/tests/qemu/arch/mips.config b/src/tests/qemu/arch/mips.config index de0e353..df71d6b 100644 --- a/src/tests/qemu/arch/mips.config +++ b/src/tests/qemu/arch/mips.config @@ -8,3 +8,4 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1024 diff --git a/src/tests/qemu/arch/mips64.config b/src/tests/qemu/arch/mips64.config index 9f0e45b..90c783f 100644 --- a/src/tests/qemu/arch/mips64.config +++ b/src/tests/qemu/arch/mips64.config @@ -11,3 +11,4 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1280 diff --git a/src/tests/qemu/arch/mips64el.config b/src/tests/qemu/arch/mips64el.config index 651a5e6..435b0b4 100644 --- a/src/tests/qemu/arch/mips64el.config +++ b/src/tests/qemu/arch/mips64el.config @@ -12,3 +12,4 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1280 diff --git a/src/tests/qemu/arch/mipsel.config b/src/tests/qemu/arch/mipsel.config index 3057456..62bb50c 100644 --- a/src/tests/qemu/arch/mipsel.config +++ b/src/tests/qemu/arch/mipsel.config @@ -9,3 +9,4 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1024 diff --git a/src/tests/qemu/arch/powerpc.config b/src/tests/qemu/arch/powerpc.config index 8ec5911..5795709 100644 --- a/src/tests/qemu/arch/powerpc.config +++ b/src/tests/qemu/arch/powerpc.config @@ -7,3 +7,4 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_MATH_EMULATION=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1024 diff --git a/src/tests/qemu/arch/powerpc64le.config b/src/tests/qemu/arch/powerpc64le.config index a43926c..b28b547 100644 --- a/src/tests/qemu/arch/powerpc64le.config +++ b/src/tests/qemu/arch/powerpc64le.config @@ -8,3 +8,4 @@ CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=hvc0 wg.success=hvc1" CONFIG_SECTION_MISMATCH_WARN_ONLY=y +CONFIG_FRAME_WARN=1280 diff --git a/src/tests/qemu/arch/x86_64.config b/src/tests/qemu/arch/x86_64.config index ed1e701..00a1ef4 100644 --- a/src/tests/qemu/arch/x86_64.config +++ b/src/tests/qemu/arch/x86_64.config @@ -2,3 +2,4 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1280 -- cgit v1.2.3-59-g8ed1b