Skip to content

qemu: Improve KVM detection and export QEMU settings to a config file #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wipawel merged 2 commits into from
Nov 21, 2023
Merged

qemu: Improve KVM detection and export QEMU settings to a config file #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a6a2e7
Makefile: improve KVM detection
wipawel Nov 21, 2023
eab821b
Makefile: handle variable QEMU settings in .qemu_config
wipawel Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .qemu_config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
QEMU_RAM=128
QEMU_CPUS=2
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,22 +249,22 @@ clean:
# Check whether we can use kvm for qemu
ifeq ($(SYSTEM),LINUX)
ifneq ($(USE_KVM), false) # you can hard-disable KVM use with the USE_KVM environment variable
HAVE_KVM=$(shell lsmod | awk '/^kvm / {print $$1}')
HAVE_KVM=$(shell test -w /dev/kvm && echo kvm)
endif # USE_KVM
endif # SYSTEM == LINUX

# Set qemu parameters
QEMU_CONFIG := $(KTF_ROOT)/.qemu_config
include $(QEMU_CONFIG)

ifeq ($(SYSTEM)$(HAVE_KVM),LINUXkvm)
QEMU_PARAMS := -cpu host
QEMU_PARAMS := -cpu host -enable-kvm
else
QEMU_PARAMS := -cpu max
endif
ifeq ($(HAVE_KVM), kvm)
QEMU_PARAMS += -enable-kvm
endif # HAVE_KVM
QEMU_PARAMS += -m 128
QEMU_PARAMS += -m $(QEMU_RAM)
QEMU_PARAMS += -serial stdio
QEMU_PARAMS += -smp cpus=2
QEMU_PARAMS += -smp cpus=$(QEMU_CPUS)
QEMU_PARAMS_NOGFX := -display none -vga none -vnc none
QEMU_PARAMS_GFX := $(QEMU_PARAMS)
QEMU_PARAMS += $(QEMU_PARAMS_NOGFX)
Expand Down