Allow a user to override the QM_SMP value giving them the opportunity to select for themselves the number of CPUs to use in qemu.
Signed-off-by: Trevor Woerner <[email protected]> --- meta/conf/machine/include/riscv/qemuriscv.inc | 2 +- meta/conf/machine/include/x86/qemuboot-x86.inc | 2 +- meta/conf/machine/qemuarm.conf | 2 +- meta/conf/machine/qemuarm64.conf | 2 +- meta/conf/machine/qemuppc64.conf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc b/meta/conf/machine/include/riscv/qemuriscv.inc index 1d32b4a58209..c977a266ca21 100644 --- a/meta/conf/machine/include/riscv/qemuriscv.inc +++ b/meta/conf/machine/include/riscv/qemuriscv.inc @@ -26,7 +26,7 @@ UBOOT_ENTRYPOINT:riscv32 = "0x80400000" UBOOT_ENTRYPOINT:riscv64 = "0x80200000" # qemuboot options -QB_SMP = "-smp 4" +QB_SMP ?= "-smp 4" QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi" QB_MACHINE = "-machine virt" QB_DEFAULT_BIOS = "fw_jump.elf" diff --git a/meta/conf/machine/include/x86/qemuboot-x86.inc b/meta/conf/machine/include/x86/qemuboot-x86.inc index 3953679366d9..dd7e7c938413 100644 --- a/meta/conf/machine/include/x86/qemuboot-x86.inc +++ b/meta/conf/machine/include/x86/qemuboot-x86.inc @@ -1,6 +1,6 @@ # For runqemu IMAGE_CLASSES += "qemuboot" -QB_SMP = "-smp 4" +QB_SMP ?= "-smp 4" QB_CPU:x86 = "-cpu IvyBridge -machine q35,i8042=off" QB_CPU_KVM:x86 = "-cpu IvyBridge -machine q35,i8042=off" diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 1bd4e3e154fc..c5234231e2e5 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -16,7 +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" +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 ffc51c803fa7..2f0f0e4f842f 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf @@ -16,7 +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_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 virtio-gpu-pci" diff --git a/meta/conf/machine/qemuppc64.conf b/meta/conf/machine/qemuppc64.conf index 770933931324..2fbd26a6f997 100644 --- a/meta/conf/machine/qemuppc64.conf +++ b/meta/conf/machine/qemuppc64.conf @@ -13,7 +13,7 @@ SERIAL_CONSOLES ?= "115200;hvc0" QB_SYSTEM_NAME = "qemu-system-ppc64" QB_MACHINE = "-machine pseries" QB_CPU = "-cpu POWER9" -QB_SMP = "-smp 2" +QB_SMP ?= "-smp 2" QB_NFSROOTFS_EXTRA_OPT = "wsize=524288,rsize=524288" QB_KERNEL_CMDLINE_APPEND = "console=hvc0 nohugevmalloc" -- 2.36.0.rc2.17.g4027e30c53
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#177548): https://lists.openembedded.org/g/openembedded-core/message/177548 Mute This Topic: https://lists.openembedded.org/mt/97118455/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
