github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-26 15:32:30 +00:00
Code Issues Projects Releases Wiki Activity

nemu-config: Add machine_type to config file

Browse Source 
nemu needs to be configured with:
`machine_type = "virt"` by default.

In addition, this commit removes
`machine_accelerators="virt"` which was added instead
of `machine_type` in a previous commit.

Fixes: #1707.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
This commit is contained in:
Salvador Fuentes 2019-05-17 11:29:14 -05:00
parent 10c14bcb38
commit 6be5e5f182
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -245,7 +245,7 @@ ifneq (,$(NEMUCMD))
# currently, huge pages are required for virtiofsd support # currently, huge pages are required for virtiofsd support
DEFENABLEHUGEPAGES_NEMU := true DEFENABLEHUGEPAGES_NEMU := true
# nemu uses virt machine type # nemu uses virt machine type
DEFMACHINEACCELERATOR_NEMU := virt DEFMACHINETYPE_NEMU := virt
DEFBLOCKSTORAGEDRIVER_NEMU := virtio-scsi DEFBLOCKSTORAGEDRIVER_NEMU := virtio-scsi
DEFNETWORKMODEL_NEMU := tcfilter DEFNETWORKMODEL_NEMU := tcfilter
KERNELNAME = $(call MAKE_KERNEL_NAME,$(KERNELTYPE)) KERNELNAME = $(call MAKE_KERNEL_NAME,$(KERNELTYPE))
@ -334,7 +334,7 @@ USER_VARS += KERNELTYPE_FC
USER_VARS += FIRMWAREPATH USER_VARS += FIRMWAREPATH
USER_VARS += FIRMWAREPATH_NEMU USER_VARS += FIRMWAREPATH_NEMU
USER_VARS += MACHINEACCELERATORS USER_VARS += MACHINEACCELERATORS
USER_VARS += DEFMACHINEACCELERATOR_NEMU USER_VARS += DEFMACHINETYPE_NEMU
USER_VARS += KERNELPARAMS USER_VARS += KERNELPARAMS
USER_VARS += LIBEXECDIR USER_VARS += LIBEXECDIR
USER_VARS += LOCALSTATEDIR USER_VARS += LOCALSTATEDIR
@ -486,7 +486,7 @@ $(GENERATED_FILES): %: %.in $(MAKEFILE_LIST) VERSION .git-commit
-e "s|@FIRMWAREPATH@|$(FIRMWAREPATH)|g" \ -e "s|@FIRMWAREPATH@|$(FIRMWAREPATH)|g" \
-e "s|@FIRMWAREPATH_NEMU@|$(FIRMWAREPATH_NEMU)|g" \ -e "s|@FIRMWAREPATH_NEMU@|$(FIRMWAREPATH_NEMU)|g" \
-e "s|@MACHINEACCELERATORS@|$(MACHINEACCELERATORS)|g" \ -e "s|@MACHINEACCELERATORS@|$(MACHINEACCELERATORS)|g" \
-e "s|@DEFMACHINEACCELERATOR_NEMU@|$(DEFMACHINEACCELERATOR_NEMU)|g" \ -e "s|@DEFMACHINETYPE_NEMU@|$(DEFMACHINETYPE_NEMU)|g" \
-e "s|@KERNELPARAMS@|$(KERNELPARAMS)|g" \ -e "s|@KERNELPARAMS@|$(KERNELPARAMS)|g" \
-e "s|@LOCALSTATEDIR@|$(LOCALSTATEDIR)|g" \ -e "s|@LOCALSTATEDIR@|$(LOCALSTATEDIR)|g" \
-e "s|@PKGLIBEXECDIR@|$(PKGLIBEXECDIR)|g" \ -e "s|@PKGLIBEXECDIR@|$(PKGLIBEXECDIR)|g" \

3
cli/config/configuration-nemu.toml.in
View File

@ -15,6 +15,7 @@
path = "@NEMUPATH@" path = "@NEMUPATH@"
kernel = "@KERNELPATH@" kernel = "@KERNELPATH@"
image = "@IMAGEPATH@" image = "@IMAGEPATH@"
machine_type = "@DEFMACHINETYPE_NEMU@"
# Optional space-separated list of options to pass to the guest kernel. # Optional space-separated list of options to pass to the guest kernel.
# For example, use `kernel_params = "vsyscall=emulate"` if you are having # For example, use `kernel_params = "vsyscall=emulate"` if you are having
@ -35,7 +36,7 @@ firmware = "@FIRMWAREPATH_NEMU@"
# Machine accelerators # Machine accelerators
# comma-separated list of machine accelerators to pass to the hypervisor. # comma-separated list of machine accelerators to pass to the hypervisor.
# For example, `machine_accelerators = "nosmm,nosmbus,nosata,nopit,static-prt,nofw"` # For example, `machine_accelerators = "nosmm,nosmbus,nosata,nopit,static-prt,nofw"`
machine_accelerators="@DEFMACHINEACCELERATOR_NEMU@" machine_accelerators=""
# Default number of vCPUs per SB/VM: # Default number of vCPUs per SB/VM:
# unspecified or 0 --> will be set to @DEFVCPUS@ # unspecified or 0 --> will be set to @DEFVCPUS@