vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'qemu-config' into 'master'

Browse source 
Make QEMU smp and mem options configurable

See merge request redox-os/redox!1435
This commit is contained in:
Jeremy Soller 2024-04-04 13:08:10 +00:00
parent e561fcd2df b5f22bd20f
commit d141f855b7
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mk/qemu.mk
View file

@ -7,7 +7,8 @@ ifeq ($(ARCH),i686)
QEMU_ARCH=i386 QEMU_ARCH=i386
QEMU_MACHINE?=pc QEMU_MACHINE?=pc
QEMU_CPU?=pentium2 QEMU_CPU?=pentium2
QEMUFLAGS+=-smp 1 -m 1024 QEMU_SMP?=1
QEMU_MEM?=1024
# Default to using kvm when arch is i686 and host is x86_64 # Default to using kvm when arch is i686 and host is x86_64
ifeq ($(HOST_ARCH),x86_64) ifeq ($(HOST_ARCH),x86_64)
@ -17,7 +18,8 @@ else ifeq ($(ARCH),x86_64)
QEMU_ARCH=x86_64 QEMU_ARCH=x86_64
QEMU_MACHINE?=q35 QEMU_MACHINE?=q35
QEMU_CPU?=core2duo QEMU_CPU?=core2duo
QEMUFLAGS+=-smp 4 -m 2048 QEMU_SMP?=4
QEMU_MEM?=2048
ifeq ($(efi),yes) ifeq ($(efi),yes)
FIRMWARE=/usr/share/OVMF/OVMF_CODE.fd FIRMWARE=/usr/share/OVMF/OVMF_CODE.fd
endif endif
@ -32,6 +34,8 @@ else ifeq ($(ARCH),aarch64)
QEMU_ARCH=aarch64 QEMU_ARCH=aarch64
QEMU_MACHINE=virt QEMU_MACHINE=virt
QEMU_CPU=max QEMU_CPU=max
QEMU_SMP?=1
QEMU_MEM?=2048
ifeq ($(BOARD),raspi3bp) ifeq ($(BOARD),raspi3bp)
FIRMWARE=$(BUILD)/raspi3bp_uboot.rom FIRMWARE=$(BUILD)/raspi3bp_uboot.rom
else ifeq ($(efi),yes) else ifeq ($(efi),yes)
@ -39,7 +43,6 @@ else ifeq ($(ARCH),aarch64)
else else
FIRMWARE=$(BUILD)/qemu_uboot.rom FIRMWARE=$(BUILD)/qemu_uboot.rom
endif endif
QEMUFLAGS+=-smp 1 -m 2048
ifneq ($(vga),no) ifneq ($(vga),no)
QEMUFLAGS+=-device ramfb QEMUFLAGS+=-device ramfb
endif endif
@ -50,6 +53,8 @@ else
$(error Unsupported ARCH for QEMU "$(ARCH)")) $(error Unsupported ARCH for QEMU "$(ARCH)"))
endif endif
QEMUFLAGS+=-smp $(QEMU_SMP) -m $(QEMU_MEM)
# If host and target arch do not match, disable kvm # If host and target arch do not match, disable kvm
# (unless overridden above or by environment) # (unless overridden above or by environment)
ifneq ($(ARCH),$(HOST_ARCH)) ifneq ($(ARCH),$(HOST_ARCH))