diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-08 10:42:22 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-13 18:09:03 +0100 |
commit | ee371325ce651cc113e43bdeb5d8986d5b84a3f4 (patch) | |
tree | 44158deeb5413dd8178e622b46b4ed79ab3af604 /meta | |
parent | 56f98d12a79585a4d4c459160f39403e05b620a5 (diff) | |
download | openembedded-core-ee371325ce651cc113e43bdeb5d8986d5b84a3f4.tar.gz |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/qemuboot.bbclass | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/qemuboot-x86.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm.conf | 1 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm64.conf | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass index 0fdd10099c..2b50ddaa22 100644 --- a/meta/classes/qemuboot.bbclass +++ b/meta/classes/qemuboot.bbclass @@ -83,7 +83,7 @@ # See "runqemu help" for more info QB_MEM ?= "-m 256" -QB_SMP ?= "-smp 4" +QB_SMP ?= "" QB_SERIAL_OPT ?= "-serial mon:stdio -serial null" QB_DEFAULT_KERNEL ?= "${KERNEL_IMAGETYPE}" QB_DEFAULT_FSTYPE ?= "ext4" 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" |