github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-31 09:26:52 +00:00
Code Issues Projects Releases Wiki Activity

config: Expose default_maxmemory

Browse Source 
Expose the newly added `default_maxmemory` to the project's Makefile and
to the configuration files.

Fixes: #4516

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio
2022-06-27 15:02:00 +02:00
parent 58ff2bd5c9
commit 0939f5181b
4 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/runtime/Makefile
View File

@@ -158,6 +158,8 @@ DEFMEMSZ := 2048
# - vm template memory # - vm template memory
# - hugepage memory # - hugepage memory
DEFMEMSLOTS := 10 DEFMEMSLOTS := 10
# Default maximum memory in MiB
DEFMAXMEMSZ := 0
#Default number of bridges #Default number of bridges
DEFBRIDGES := 1 DEFBRIDGES := 1
DEFENABLEANNOTATIONS := [\"enable_iommu\"] DEFENABLEANNOTATIONS := [\"enable_iommu\"]
@@ -442,6 +444,7 @@ USER_VARS += DEFMAXVCPUS
USER_VARS += DEFMAXVCPUS_ACRN USER_VARS += DEFMAXVCPUS_ACRN
USER_VARS += DEFMEMSZ USER_VARS += DEFMEMSZ
USER_VARS += DEFMEMSLOTS USER_VARS += DEFMEMSLOTS
USER_VARS += DEFMAXMEMSZ
USER_VARS += DEFBRIDGES USER_VARS += DEFBRIDGES
USER_VARS += DEFNETWORKMODEL_ACRN USER_VARS += DEFNETWORKMODEL_ACRN
USER_VARS += DEFNETWORKMODEL_CLH USER_VARS += DEFNETWORKMODEL_CLH

6
src/runtime/config/configuration-clh.toml.in
View File

@@ -105,6 +105,12 @@ default_memory = @DEFMEMSZ@
# This is will determine the times that memory will be hotadded to sandbox/VM. # This is will determine the times that memory will be hotadded to sandbox/VM.
#memory_slots = @DEFMEMSLOTS@ #memory_slots = @DEFMEMSLOTS@
# Default maximum memory in MiB per SB / VM
# unspecified or == 0 --> will be set to the actual amount of physical RAM
# > 0 <= amount of physical RAM --> will be set to the specified number
# > amount of physical RAM --> will be set to the actual amount of physical RAM
default_maxmemory = @DEFMAXMEMSZ@
# Shared file system type: # Shared file system type:
# - virtio-fs (default) # - virtio-fs (default)
# - virtio-fs-nydus # - virtio-fs-nydus

7
src/runtime/config/configuration-fc.toml.in
View File

@@ -91,6 +91,7 @@ default_bridges = @DEFBRIDGES@
# Default memory size in MiB for SB/VM. # Default memory size in MiB for SB/VM.
# If unspecified then it will be set @DEFMEMSZ@ MiB. # If unspecified then it will be set @DEFMEMSZ@ MiB.
default_memory = @DEFMEMSZ@ default_memory = @DEFMEMSZ@
# #
# Default memory slots per SB/VM. # Default memory slots per SB/VM.
# If unspecified then it will be set @DEFMEMSLOTS@. # If unspecified then it will be set @DEFMEMSLOTS@.
@@ -104,6 +105,12 @@ default_memory = @DEFMEMSZ@
# Default 0 # Default 0
#memory_offset = 0 #memory_offset = 0
# Default maximum memory in MiB per SB / VM
# unspecified or == 0 --> will be set to the actual amount of physical RAM
# > 0 <= amount of physical RAM --> will be set to the specified number
# > amount of physical RAM --> will be set to the actual amount of physical RAM
default_maxmemory = @DEFMAXMEMSZ@
# Block storage driver to be used for the hypervisor in case the container # Block storage driver to be used for the hypervisor in case the container
# rootfs is backed by a block device. This is virtio-scsi, virtio-blk # rootfs is backed by a block device. This is virtio-scsi, virtio-blk
# or nvdimm. # or nvdimm.

6
src/runtime/config/configuration-qemu.toml.in
View File

@@ -134,6 +134,12 @@ default_memory = @DEFMEMSZ@
# This is will determine the times that memory will be hotadded to sandbox/VM. # This is will determine the times that memory will be hotadded to sandbox/VM.
#memory_slots = @DEFMEMSLOTS@ #memory_slots = @DEFMEMSLOTS@
# Default maximum memory in MiB per SB / VM
# unspecified or == 0 --> will be set to the actual amount of physical RAM
# > 0 <= amount of physical RAM --> will be set to the specified number
# > amount of physical RAM --> will be set to the actual amount of physical RAM
default_maxmemory = @DEFMAXMEMSZ@
# The size in MiB will be plused to max memory of hypervisor. # The size in MiB will be plused to max memory of hypervisor.
# It is the memory address space for the NVDIMM devie. # It is the memory address space for the NVDIMM devie.
# If set block storage driver (block_device_driver) to "nvdimm", # If set block storage driver (block_device_driver) to "nvdimm",