From 34e1bea0e846b88200e933c96a539fb440dec4df Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 8 May 2021 10:42:22 +0100 Subject: qemu: Set SMP to 4 cpus for arm/x86 only Only qemux86* and qemuarm* support SMP with our current configurations so rework qemu SMP enabling to account for that and only use it on the architectures where it works. (From OE-Core rev: ee371325ce651cc113e43bdeb5d8986d5b84a3f4) Signed-off-by: Richard Purdie --- meta/conf/machine/include/qemuboot-x86.inc | 1 + meta/conf/machine/qemuarm.conf | 1 + meta/conf/machine/qemuarm64.conf | 1 + 3 files changed, 3 insertions(+) (limited to 'meta/conf/machine') diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 2a4760c717..9b1e1c4975 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc @@ -1,5 +1,6 @@ # For runqemu IMAGE_CLASSES += "qemuboot" +QB_SMP = "-smp 4" QB_CPU_x86 = "-cpu core2duo" QB_CPU_KVM_x86 = "-cpu core2duo" diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index e5ec4cc065..34fcde698c 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -16,6 +16,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine virt,highmem=off" QB_CPU = "-cpu cortex-a15" +QB_SMP = "-smp 4" # Standard Serial console QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" # For graphics to work we need to define the VGA device as well as the necessary USB devices diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index 51f7ecdcfd..150a0744eb 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf @@ -16,6 +16,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" QB_SYSTEM_NAME = "qemu-system-aarch64" QB_MACHINE = "-machine virt" QB_CPU = "-cpu cortex-a57" +QB_SMP = "-smp 4" QB_CPU_KVM = "-cpu host -machine gic-version=3" # For graphics to work we need to define the VGA device as well as the necessary USB devices QB_GRAPHICS = "-device VGA,edid=on" -- cgit v1.2.3-54-g00ecf