github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-01 05:04:26 +00:00
Code Issues Projects Releases Wiki Activity

makefile: Improve names of config entries for annotation checks

Browse Source 
The entries used to be things like PATH_LIST, which are too generic.
Replace them with more precise name with a distinguishing keyword,
namely VALID. For example valid_hypervisor_paths.

Fixes: #901

Suggested-by: James O.D. Hunt <james.o.hunt@intel.com>
Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
This commit is contained in:
Christophe de Dinechin 2020-09-10 21:22:59 +02:00
parent b119427405
commit be6ee2550d
7 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/runtime/Makefile
View File

@ -129,22 +129,22 @@ DEFAULT_HYPERVISOR ?= $(HYPERVISOR_QEMU)
HYPERVISORS := $(HYPERVISOR_ACRN) $(HYPERVISOR_FC) $(HYPERVISOR_QEMU) $(HYPERVISOR_QEMU_VIRTIOFS) $(HYPERVISOR_CLH) HYPERVISORS := $(HYPERVISOR_ACRN) $(HYPERVISOR_FC) $(HYPERVISOR_QEMU) $(HYPERVISOR_QEMU_VIRTIOFS) $(HYPERVISOR_CLH)
QEMUPATH := $(QEMUBINDIR)/$(QEMUCMD) QEMUPATH := $(QEMUBINDIR)/$(QEMUCMD)
QEMUPATHLIST := [\"$(QEMUPATH)\"] QEMUVALIDHYPERVISORPATHS := [\"$(QEMUPATH)\"]
QEMUVIRTIOFSPATH := $(QEMUBINDIR)/$(QEMUVIRTIOFSCMD) QEMUVALIDVIRTIOFSPATHS := $(QEMUBINDIR)/$(QEMUVIRTIOFSCMD)
CLHPATH := $(CLHBINDIR)/$(CLHCMD) CLHPATH := $(CLHBINDIR)/$(CLHCMD)
CLHPATHLIST := [\"$(CLHBINDIR)/$(CLHCMD)\"] CLHVALIDHYPERVISORPATHS := [\"$(CLHBINDIR)/$(CLHCMD)\"]
FCPATH = $(FCBINDIR)/$(FCCMD) FCPATH = $(FCBINDIR)/$(FCCMD)
FCPATHLIST = [\"$(FCPATH)\"] FCVALIDPATHS = [\"$(FCPATH)\"]
FCJAILERPATH = $(FCBINDIR)/$(FCJAILERCMD) FCJAILERPATH = $(FCBINDIR)/$(FCJAILERCMD)
FCJAILERPATHLIST = [\"$(FCJAILERPATH)\"] FCVALIDJAILERPATHS = [\"$(FCJAILERPATH)\"]
ACRNPATH := $(ACRNBINDIR)/$(ACRNCMD) ACRNPATH := $(ACRNBINDIR)/$(ACRNCMD)
ACRNPATHLIST := [\"$(ACRNPATH)\"] ACRNVALIDHYPERVISORPATHS := [\"$(ACRNPATH)\"]
ACRNCTLPATH := $(ACRNBINDIR)/$(ACRNCTLCMD) ACRNCTLPATH := $(ACRNBINDIR)/$(ACRNCTLCMD)
ACRNCTLPATHLIST := [\"$(ACRNCTLPATH)\"] ACRNVALIDCTLPATHS := [\"$(ACRNCTLPATH)\"]
SHIMCMD := $(BIN_PREFIX)-shim SHIMCMD := $(BIN_PREFIX)-shim
SHIMPATH := $(PKGLIBEXECDIR)/$(SHIMCMD) SHIMPATH := $(PKGLIBEXECDIR)/$(SHIMCMD)
@ -179,7 +179,7 @@ DEFDISABLEBLOCK := false
DEFSHAREDFS := virtio-9p DEFSHAREDFS := virtio-9p
DEFSHAREDFS_QEMU_VIRTIOFS := virtio-fs DEFSHAREDFS_QEMU_VIRTIOFS := virtio-fs
DEFVIRTIOFSDAEMON := $(VIRTIOFSDBINDIR)/virtiofsd DEFVIRTIOFSDAEMON := $(VIRTIOFSDBINDIR)/virtiofsd
DEFVIRTIOFSDAEMONLIST := [\"$(DEFVIRTIOFSDAEMON)\"] DEFVALIDVIRTIOFSDAEMONPATHS := [\"$(DEFVIRTIOFSDAEMON)\"]
# Default DAX mapping cache size in MiB # Default DAX mapping cache size in MiB
#if value is 0, DAX is not enabled #if value is 0, DAX is not enabled
DEFVIRTIOFSCACHESIZE := 0 DEFVIRTIOFSCACHESIZE := 0
@ -195,9 +195,9 @@ DEFENABLEMEMPREALLOC := false
DEFENABLEHUGEPAGES := false DEFENABLEHUGEPAGES := false
DEFENABLEVHOSTUSERSTORE := false DEFENABLEVHOSTUSERSTORE := false
DEFVHOSTUSERSTOREPATH := $(PKGRUNDIR)/vhost-user DEFVHOSTUSERSTOREPATH := $(PKGRUNDIR)/vhost-user
DEFVHOSTUSERSTOREPATHLIST := [\"$(DEFVHOSTUSERSTOREPATH)\"] DEFVALIDVHOSTUSERSTOREPATHS := [\"$(DEFVHOSTUSERSTOREPATH)\"]
DEFFILEMEMBACKEND := "" DEFFILEMEMBACKEND := ""
DEFFILEMEMBACKENDLIST := [\"$(DEFFILEMEMBACKEND)\"] DEFVALIDFILEMEMBACKENDS := [\"$(DEFFILEMEMBACKEND)\"]
DEFENABLESWAP := false DEFENABLESWAP := false
DEFENABLEDEBUG := false DEFENABLEDEBUG := false
DEFDISABLENESTINGCHECKS := false DEFDISABLENESTINGCHECKS := false
@ -404,14 +404,14 @@ USER_VARS += ACRNCTLCMD
USER_VARS += ACRNPATH USER_VARS += ACRNPATH
USER_VARS += ACRNPATHLIST USER_VARS += ACRNPATHLIST
USER_VARS += ACRNCTLPATH USER_VARS += ACRNCTLPATH
USER_VARS += ACRNCTLPATHLIST USER_VARS += ACRNVALIDCTLPATHS
USER_VARS += CLHPATH USER_VARS += CLHPATH
USER_VARS += CLHPATHLIST USER_VARS += CLHVALIDHYPERVISORPATHS
USER_VARS += FCCMD USER_VARS += FCCMD
USER_VARS += FCPATH USER_VARS += FCPATH
USER_VARS += FCPATHLIST USER_VARS += FCVALIDHYPERVISORPATHS
USER_VARS += FCJAILERPATH USER_VARS += FCJAILERPATH
USER_VARS += FCJAILERPATHLIST USER_VARS += FCVALIDJAILERPATHS
USER_VARS += SYSCONFIG USER_VARS += SYSCONFIG
USER_VARS += IMAGENAME USER_VARS += IMAGENAME
USER_VARS += IMAGEPATH USER_VARS += IMAGEPATH
@ -442,10 +442,10 @@ USER_VARS += NETMONPATH
USER_VARS += QEMUBINDIR USER_VARS += QEMUBINDIR
USER_VARS += QEMUCMD USER_VARS += QEMUCMD
USER_VARS += QEMUPATH USER_VARS += QEMUPATH
USER_VARS += QEMUPATHLIST USER_VARS += QEMUVALIDPATHS
USER_VARS += QEMUVIRTIOFSCMD USER_VARS += QEMUVIRTIOFSCMD
USER_VARS += QEMUVIRTIOFSPATH USER_VARS += QEMUVIRTIOFSPATH
USER_VARS += QEMUVIRTIOFSPATHLIST USER_VARS += QEMUVALIDVIRTIOFSPATHS
USER_VARS += SHAREDIR USER_VARS += SHAREDIR
USER_VARS += SHIMPATH USER_VARS += SHIMPATH
USER_VARS += SYSCONFDIR USER_VARS += SYSCONFDIR
@ -468,7 +468,7 @@ USER_VARS += DEFBLOCKSTORAGEDRIVER_QEMU_VIRTIOFS
USER_VARS += DEFSHAREDFS USER_VARS += DEFSHAREDFS
USER_VARS += DEFSHAREDFS_QEMU_VIRTIOFS USER_VARS += DEFSHAREDFS_QEMU_VIRTIOFS
USER_VARS += DEFVIRTIOFSDAEMON USER_VARS += DEFVIRTIOFSDAEMON
USER_VARS += DEFVIRTIOFSDAEMONLIST USER_VARS += DEFVALIDVIRTIOFSDAEMONPATHS
USER_VARS += DEFVIRTIOFSCACHESIZE USER_VARS += DEFVIRTIOFSCACHESIZE
USER_VARS += DEFVIRTIOFSCACHE USER_VARS += DEFVIRTIOFSCACHE
USER_VARS += DEFVIRTIOFSEXTRAARGS USER_VARS += DEFVIRTIOFSEXTRAARGS
@ -477,9 +477,9 @@ USER_VARS += DEFENABLEMEMPREALLOC
USER_VARS += DEFENABLEHUGEPAGES USER_VARS += DEFENABLEHUGEPAGES
USER_VARS += DEFENABLEVHOSTUSERSTORE USER_VARS += DEFENABLEVHOSTUSERSTORE
USER_VARS += DEFVHOSTUSERSTOREPATH USER_VARS += DEFVHOSTUSERSTOREPATH
USER_VARS += DEFVHOSTUSERSTOREPATHLIST USER_VARS += DEFVALIDVHOSTUSERSTOREPATHS
USER_VARS += DEFFILEMEMBACKEND USER_VARS += DEFFILEMEMBACKEND
USER_VARS += DEFFILEMEMBACKENDLIST USER_VARS += DEFVALIDFILEMEMBACKENDS
USER_VARS += DEFENABLESWAP USER_VARS += DEFENABLESWAP
USER_VARS += DEFENABLEDEBUG USER_VARS += DEFENABLEDEBUG
USER_VARS += DEFDISABLENESTINGCHECKS USER_VARS += DEFDISABLENESTINGCHECKS
@ -629,15 +629,15 @@ $(GENERATED_FILES): %: %.in $(MAKEFILE_LIST) VERSION .git-commit
-e "s|@CONFIG_FC_IN@|$(CONFIG_FC_IN)|g" \ -e "s|@CONFIG_FC_IN@|$(CONFIG_FC_IN)|g" \
-e "s|@CONFIG_PATH@|$(CONFIG_PATH)|g" \ -e "s|@CONFIG_PATH@|$(CONFIG_PATH)|g" \
-e "s|@FCPATH@|$(FCPATH)|g" \ -e "s|@FCPATH@|$(FCPATH)|g" \
-e "s|@FCPATHLIST@|$(FCPATHLIST)|g" \ -e "s|@FCVALIDHYPERVISORPATHS@|$(FCVALIDHYPERVISORPATHS)|g" \
-e "s|@FCJAILERPATH@|$(FCJAILERPATH)|g" \ -e "s|@FCJAILERPATH@|$(FCJAILERPATH)|g" \
-e "s|@FCJAILERPATHLIST@|$(FCJAILERPATHLIST)|g" \ -e "s|@FCVALIDJAILERPATHS@|$(FCVALIDJAILERPATHS)|g" \
-e "s|@ACRNPATH@|$(ACRNPATH)|g" \ -e "s|@ACRNPATH@|$(ACRNPATH)|g" \
-e "s|@ACRNPATHLIST@|$(ACRNPATHLIST)|g" \ -e "s|@ACRNVALIDHYPERVISORPATHS@|$(ACRNVALIDHYPERVISORPATHS)|g" \
-e "s|@ACRNCTLPATH@|$(ACRNCTLPATH)|g" \ -e "s|@ACRNCTLPATH@|$(ACRNCTLPATH)|g" \
-e "s|@ACRNCTLPATHLIST@|$(ACRNCTLPATHLIST)|g" \ -e "s|@ACRNVALIDCTLPATHS@|$(ACRNVALIDCTLPATHS)|g" \
-e "s|@CLHPATH@|$(CLHPATH)|g" \ -e "s|@CLHPATH@|$(CLHPATH)|g" \
-e "s|@CLHPATHLIST@|$(CLHPATHLIST)|g" \ -e "s|@CLHVALIDHYPERVISORPATHS@|$(CLHVALIDHYPERVISORPATHS)|g" \
-e "s|@SYSCONFIG@|$(SYSCONFIG)|g" \ -e "s|@SYSCONFIG@|$(SYSCONFIG)|g" \
-e "s|@IMAGEPATH@|$(IMAGEPATH)|g" \ -e "s|@IMAGEPATH@|$(IMAGEPATH)|g" \
-e "s|@KERNELPATH_ACRN@|$(KERNELPATH_ACRN)|g" \ -e "s|@KERNELPATH_ACRN@|$(KERNELPATH_ACRN)|g" \
@ -663,9 +663,9 @@ $(GENERATED_FILES): %: %.in $(MAKEFILE_LIST) VERSION .git-commit
-e "s|@PROJECT_TAG@|$(PROJECT_TAG)|g" \ -e "s|@PROJECT_TAG@|$(PROJECT_TAG)|g" \
-e "s|@PROJECT_TYPE@|$(PROJECT_TYPE)|g" \ -e "s|@PROJECT_TYPE@|$(PROJECT_TYPE)|g" \
-e "s|@QEMUPATH@|$(QEMUPATH)|g" \ -e "s|@QEMUPATH@|$(QEMUPATH)|g" \
-e "s|@QEMUPATHLIST@|$(QEMUPATHLIST)|g" \ -e "s|@QEMUVALIDHYPERVISORPATHS@|$(QEMUVALIDHYPERVISORPATHS)|g" \
-e "s|@QEMUVIRTIOFSPATH@|$(QEMUVIRTIOFSPATH)|g" \ -e "s|@QEMUVIRTIOFSPATH@|$(QEMUVIRTIOFSPATH)|g" \
-e "s|@QEMUVIRTIOFSPATHLIST@|$(QEMUVIRTIOFSPATHLIST)|g" \ -e "s|@QEMUVALIDVIRTIOFSPATHS@|$(QEMUVALIDVIRTIOFSPATHS)|g" \
-e "s|@RUNTIME_NAME@|$(TARGET)|g" \ -e "s|@RUNTIME_NAME@|$(TARGET)|g" \
-e "s|@MACHINETYPE@|$(MACHINETYPE)|g" \ -e "s|@MACHINETYPE@|$(MACHINETYPE)|g" \
-e "s|@SHIMPATH@|$(SHIMPATH)|g" \ -e "s|@SHIMPATH@|$(SHIMPATH)|g" \
@ -690,7 +690,7 @@ $(GENERATED_FILES): %: %.in $(MAKEFILE_LIST) VERSION .git-commit
-e "s|@DEFSHAREDFS@|$(DEFSHAREDFS)|g" \ -e "s|@DEFSHAREDFS@|$(DEFSHAREDFS)|g" \
-e "s|@DEFSHAREDFS_QEMU_VIRTIOFS@|$(DEFSHAREDFS_QEMU_VIRTIOFS)|g" \ -e "s|@DEFSHAREDFS_QEMU_VIRTIOFS@|$(DEFSHAREDFS_QEMU_VIRTIOFS)|g" \
-e "s|@DEFVIRTIOFSDAEMON@|$(DEFVIRTIOFSDAEMON)|g" \ -e "s|@DEFVIRTIOFSDAEMON@|$(DEFVIRTIOFSDAEMON)|g" \
-e "s|@DEFVIRTIOFSDAEMONLIST@|$(DEFVIRTIOFSDAEMONLIST)|g" \ -e "s|@DEFVALIDVIRTIOFSDAEMONPATHS@|$(DEFVALIDVIRTIOFSDAEMONPATHS)|g" \
-e "s|@DEFVIRTIOFSCACHESIZE@|$(DEFVIRTIOFSCACHESIZE)|g" \ -e "s|@DEFVIRTIOFSCACHESIZE@|$(DEFVIRTIOFSCACHESIZE)|g" \
-e "s|@DEFVIRTIOFSCACHE@|$(DEFVIRTIOFSCACHE)|g" \ -e "s|@DEFVIRTIOFSCACHE@|$(DEFVIRTIOFSCACHE)|g" \
-e "s|@DEFVIRTIOFSEXTRAARGS@|$(DEFVIRTIOFSEXTRAARGS)|g" \ -e "s|@DEFVIRTIOFSEXTRAARGS@|$(DEFVIRTIOFSEXTRAARGS)|g" \
@ -699,9 +699,9 @@ $(GENERATED_FILES): %: %.in $(MAKEFILE_LIST) VERSION .git-commit
-e "s|@DEFENABLEHUGEPAGES@|$(DEFENABLEHUGEPAGES)|g" \ -e "s|@DEFENABLEHUGEPAGES@|$(DEFENABLEHUGEPAGES)|g" \
-e "s|@DEFENABLEVHOSTUSERSTORE@|$(DEFENABLEVHOSTUSERSTORE)|g" \ -e "s|@DEFENABLEVHOSTUSERSTORE@|$(DEFENABLEVHOSTUSERSTORE)|g" \
-e "s|@DEFVHOSTUSERSTOREPATH@|$(DEFVHOSTUSERSTOREPATH)|g" \ -e "s|@DEFVHOSTUSERSTOREPATH@|$(DEFVHOSTUSERSTOREPATH)|g" \
-e "s|@DEFVHOSTUSERSTOREPATHLIST@|$(DEFVHOSTUSERSTOREPATHLIST)|g" \ -e "s|@DEFVALIDVHOSTUSERSTOREPATHS@|$(DEFVALIDVHOSTUSERSTOREPATHS)|g" \
-e "s|@DEFFILEMEMBACKEND@|$(DEFFILEMEMBACKEND)|g" \ -e "s|@DEFFILEMEMBACKEND@|$(DEFFILEMEMBACKEND)|g" \
-e "s|@DEFFILEMEMBACKENDLIST@|$(DEFFILEMEMBACKENDLIST)|g" \ -e "s|@DEFVALIDFILEMEMBACKENDS@|$(DEFVALIDFILEMEMBACKENDS)|g" \
-e "s|@DEFENABLEMSWAP@|$(DEFENABLESWAP)|g" \ -e "s|@DEFENABLEMSWAP@|$(DEFENABLESWAP)|g" \
-e "s|@DEFENABLEDEBUG@|$(DEFENABLEDEBUG)|g" \ -e "s|@DEFENABLEDEBUG@|$(DEFENABLEDEBUG)|g" \
-e "s|@DEFDISABLENESTINGCHECKS@|$(DEFDISABLENESTINGCHECKS)|g" \ -e "s|@DEFDISABLENESTINGCHECKS@|$(DEFDISABLENESTINGCHECKS)|g" \

8
src/runtime/cli/config/configuration-acrn.toml.in
View File

@ -24,13 +24,13 @@ enable_annotations = @DEFENABLEANNOTATIONS@
# List of valid annotations values for the hypervisor # List of valid annotations values for the hypervisor
# Each member of the list is a path pattern as described by glob(3). # Each member of the list is a path pattern as described by glob(3).
# The default if not set is empty (all annotations rejected.) # The default if not set is empty (all annotations rejected.)
# Your distribution recommends: @ACRNPATHLIST@ # Your distribution recommends: @ACRNVALIDHYPERVISORPATHS@
path_list = @ACRNPATHLIST@ valid_hypervisor_paths = @ACRNVALIDHYPERVISORPATHS@
# List of valid annotations values for ctlpath # List of valid annotations values for ctlpath
# The default if not set is empty (all annotations rejected.) # The default if not set is empty (all annotations rejected.)
# Your distribution recommends: @ACRNCTLPATHLIST@ # Your distribution recommends: @ACRNVALIDCTLPATHS@
ctlpath_list = @ACRNCTLPATHLIST@ valid_ctlpaths = @ACRNVALIDCTLPATHS@
# 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

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

@ -23,8 +23,8 @@ enable_annotations = @DEFENABLEANNOTATIONS@
# List of valid annotations values for the hypervisor # List of valid annotations values for the hypervisor
# Each member of the list is a path pattern as described by glob(3). # Each member of the list is a path pattern as described by glob(3).
# The default if not set is empty (all annotations rejected.) # The default if not set is empty (all annotations rejected.)
# Your distribution recommends: @CLHPATHLIST@ # Your distribution recommends: @CLHVALIDHYPERVISORPATHS@
path_list = @CLHPATHLIST@ valid_hypervisor_paths = @CLHVALIDHYPERVISORPATHS@
# 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
@ -75,8 +75,8 @@ virtio_fs_daemon = "@DEFVIRTIOFSDAEMON@"
# List of valid annotations values for the virtiofs daemon # List of valid annotations values for the virtiofs daemon
# The default if not set is empty (all annotations rejected.) # The default if not set is empty (all annotations rejected.)
# Your distribution recommends: @DEFVIRTIOFSDAEMONLIST@ # Your distribution recommends: @DEFVALIDVIRTIOFSDAEMONPATHS@
virtio_fs_daemon_list = @DEFVIRTIOFSDAEMONLIST@ valid_virtio_fs_daemon_paths = @DEFVALIDVIRTIOFSDAEMONPATHS@
# Default size of DAX cache in MiB # Default size of DAX cache in MiB
virtio_fs_cache_size = @DEFVIRTIOFSCACHESIZE@ virtio_fs_cache_size = @DEFVIRTIOFSCACHESIZE@

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

@ -23,8 +23,8 @@ enable_annotations = @DEFENABLEANNOTATIONS@
# List of valid annotations values for the hypervisor # List of valid annotations values for the hypervisor
# Each member of the list is a path pattern as described by glob(3). # Each member of the list is a path pattern as described by glob(3).
# The default if not set is empty (all annotations rejected.) # The default if not set is empty (all annotations rejected.)
# Your distribution recommends: @FCPATHLIST@ # Your distribution recommends: @FCVALIDHYPERVISORPATHS@
path_list = @FCPATHLIST@ valid_hypervisor_paths = @FCVALIDHYPERVISORPATHS@
# Path for the jailer specific to firecracker # Path for the jailer specific to firecracker
# If the jailer path is not set kata will launch firecracker # If the jailer path is not set kata will launch firecracker
@ -37,8 +37,8 @@ path_list = @FCPATHLIST@
# List of valid jailer path values for the hypervisor # List of valid jailer path values for the hypervisor
# Each member of the list can be a regular expression # Each member of the list can be a regular expression
# The default if not set is empty (all annotations rejected.) # The default if not set is empty (all annotations rejected.)
# Your distribution recommends: @FCJAILERPATHLIST@ # Your distribution recommends: @FCVALIDJAILERPATHS@
jailer_path_list = @FCJAILERPATHLIST@ valid_jailer_paths = @FCVALIDJAILERPATHS@
# Optional space-separated list of options to pass to the guest kernel. # Optional space-separated list of options to pass to the guest kernel.

16
src/runtime/cli/config/configuration-qemu-virtiofs.toml.in
View File

@ -26,8 +26,8 @@ enable_annotations = @DEFENABLEANNOTATIONS@
# List of valid annotations values for the hypervisor # List of valid annotations values for the hypervisor
# Each member of the list is a path pattern as described by glob(3). # Each member of the list is a path pattern as described by glob(3).
# The default if not set is empty (all annotations rejected.) # The default if not set is empty (all annotations rejected.)
# Your distribution recommends: @QEMUVIRTIOFSPATHLIST@ # Your distribution recommends: @QEMUVALIDHYPERVISORPATHS@
path_list = @QEMUVIRTIOFSPATHLIST@ valid_hypervisor_paths = @QEMUVALIDHYPERVISORPATHS@
# 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
@ -125,8 +125,8 @@ virtio_fs_daemon = "@DEFVIRTIOFSDAEMON@"
# List of valid annotations values for the virtiofs daemon # List of valid annotations values for the virtiofs daemon
# The default if not set is empty (all annotations rejected.) # The default if not set is empty (all annotations rejected.)
# Your distribution recommends: @DEFVIRTIOFSDAEMONLIST@ # Your distribution recommends: @DEFVALIDVIRTIOFSDAEMONPATHS@
virtio_fs_daemon_list = @DEFVIRTIOFSDAEMONLIST@ valid_virtio_fs_daemon_paths = @DEFVALIDVIRTIOFSDAEMONPATHS@
# Default size of DAX cache in MiB # Default size of DAX cache in MiB
virtio_fs_cache_size = @DEFVIRTIOFSCACHESIZE@ virtio_fs_cache_size = @DEFVIRTIOFSCACHESIZE@
@ -219,8 +219,8 @@ vhost_user_store_path = "@DEFVHOSTUSERSTOREPATH@"
# List of valid annotations values for the virtiofs daemon # List of valid annotations values for the virtiofs daemon
# The default if not set is empty (all annotations rejected.) # The default if not set is empty (all annotations rejected.)
# Your distribution recommends: @DEFVHOSTUSERSTOREPATHLIST@ # Your distribution recommends: @DEFVALIDVHOSTUSERSTOREPATHS@
vhost_user_store_path_list = @DEFVHOSTUSERSTOREPATHLIST@ valid_vhost_user_store_paths = @DEFVALIDVHOSTUSERSTOREPATHS@
# Enable file based guest memory support. The default is an empty string which # Enable file based guest memory support. The default is an empty string which
# will disable this feature. In the case of virtio-fs, this is enabled # will disable this feature. In the case of virtio-fs, this is enabled
@ -230,8 +230,8 @@ vhost_user_store_path_list = @DEFVHOSTUSERSTOREPATHLIST@
# List of valid annotations values for the file_mem_backend annotation # List of valid annotations values for the file_mem_backend annotation
# The default if not set is empty (all annotations rejected.) # The default if not set is empty (all annotations rejected.)
# Your distribution recommends: @DEFFILEMEMBACKENDLIST@ # Your distribution recommends: @DEFVALIDVHOSTUSERSTOREPATHS@
file_mem_backend_list = @DEFFILEMEMBACKENDLIST@ valid_file_mem_backends = @DEFVALIDFILEMEMBACKENDS@
# Enable swap of vm memory. Default false. # Enable swap of vm memory. Default false.
# The behaviour is undefined if mem_prealloc is also set to true # The behaviour is undefined if mem_prealloc is also set to true

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

@ -24,8 +24,8 @@ enable_annotations = @DEFENABLEANNOTATIONS@
# List of valid annotations values for the hypervisor # List of valid annotations values for the hypervisor
# Each member of the list is a path pattern as described by glob(3). # Each member of the list is a path pattern as described by glob(3).
# The default if not set is empty (all annotations rejected.) # The default if not set is empty (all annotations rejected.)
# Your distribution recommends: @QEMUPATHLIST@ # Your distribution recommends: @QEMUVALIDHYPERVISORPATHS@
path_list = @QEMUPATHLIST@ valid_hypervisor_paths = @QEMUVALIDHYPERVISORPATHS@
# 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
@ -129,8 +129,8 @@ virtio_fs_daemon = "@DEFVIRTIOFSDAEMON@"
# List of valid annotations values for the virtiofs daemon # List of valid annotations values for the virtiofs daemon
# The default if not set is empty (all annotations rejected.) # The default if not set is empty (all annotations rejected.)
# Your distribution recommends: @DEFVIRTIOFSDAEMONLIST@ # Your distribution recommends: @DEFVALIDVIRTIOFSDAEMONPATHS@
virtio_fs_daemon_list = @DEFVIRTIOFSDAEMONLIST@ valid_virtio_fs_daemon_paths = @DEFVALIDVIRTIOFSDAEMONPATHS@
# Default size of DAX cache in MiB # Default size of DAX cache in MiB
virtio_fs_cache_size = @DEFVIRTIOFSCACHESIZE@ virtio_fs_cache_size = @DEFVIRTIOFSCACHESIZE@
@ -223,8 +223,8 @@ vhost_user_store_path = "@DEFVHOSTUSERSTOREPATH@"
# List of valid annotations values for the vhost user store path # List of valid annotations values for the vhost user store path
# The default if not set is empty (all annotations rejected.) # The default if not set is empty (all annotations rejected.)
# Your distribution recommends: @DEFVHOSTUSERSTOREPATHLIST@ # Your distribution recommends: @DEFVALIDVHOSTUSERSTOREPATHS@
vhost_user_store_path_list = @DEFVHOSTUSERSTOREPATHLIST@ valid_vhost_user_store_paths = @DEFVALIDVHOSTUSERSTOREPATHS@
# Enable file based guest memory support. The default is an empty string which # Enable file based guest memory support. The default is an empty string which
# will disable this feature. In the case of virtio-fs, this is enabled # will disable this feature. In the case of virtio-fs, this is enabled
@ -234,8 +234,8 @@ vhost_user_store_path_list = @DEFVHOSTUSERSTOREPATHLIST@
# List of valid annotations values for the file_mem_backend annotation # List of valid annotations values for the file_mem_backend annotation
# The default if not set is empty (all annotations rejected.) # The default if not set is empty (all annotations rejected.)
# Your distribution recommends: @DEFFILEMEMBACKENDLIST@ # Your distribution recommends: @DEFVALIDFILEMEMBACKENDS@
file_mem_backend_list = @DEFFILEMEMBACKENDLIST@ valid_file_mem_backends = @DEFVALIDFILEMEMBACKENDS@
# Enable swap of vm memory. Default false. # Enable swap of vm memory. Default false.
# The behaviour is undefined if mem_prealloc is also set to true # The behaviour is undefined if mem_prealloc is also set to true

12
src/runtime/pkg/katautils/config.go
View File

@ -71,12 +71,12 @@ type factory struct {
type hypervisor struct { type hypervisor struct {
Path string `toml:"path"` Path string `toml:"path"`
HypervisorPathList []string `toml:"path_list"` HypervisorPathList []string `toml:"valid_hypervisor_paths"`
JailerPath string `toml:"jailer_path"` JailerPath string `toml:"jailer_path"`
JailerPathList []string `toml:"jailer_path_list"` JailerPathList []string `toml:"valid_jailer_paths"`
Kernel string `toml:"kernel"` Kernel string `toml:"kernel"`
CtlPath string `toml:"ctlpath"` CtlPath string `toml:"ctlpath"`
CtlPathList []string `toml:"ctlpath_list"` CtlPathList []string `toml:"valid_ctlpaths"`
Initrd string `toml:"initrd"` Initrd string `toml:"initrd"`
Image string `toml:"image"` Image string `toml:"image"`
Firmware string `toml:"firmware"` Firmware string `toml:"firmware"`
@ -88,7 +88,7 @@ type hypervisor struct {
EntropySource string `toml:"entropy_source"` EntropySource string `toml:"entropy_source"`
SharedFS string `toml:"shared_fs"` SharedFS string `toml:"shared_fs"`
VirtioFSDaemon string `toml:"virtio_fs_daemon"` VirtioFSDaemon string `toml:"virtio_fs_daemon"`
VirtioFSDaemonList []string `toml:"virtio_fs_daemon_list"` VirtioFSDaemonList []string `toml:"valid_virtio_fs_daemon_paths"`
VirtioFSCache string `toml:"virtio_fs_cache"` VirtioFSCache string `toml:"virtio_fs_cache"`
VirtioFSExtraArgs []string `toml:"virtio_fs_extra_args"` VirtioFSExtraArgs []string `toml:"virtio_fs_extra_args"`
VirtioFSCacheSize uint32 `toml:"virtio_fs_cache_size"` VirtioFSCacheSize uint32 `toml:"virtio_fs_cache_size"`
@ -97,7 +97,7 @@ type hypervisor struct {
BlockDeviceCacheNoflush bool `toml:"block_device_cache_noflush"` BlockDeviceCacheNoflush bool `toml:"block_device_cache_noflush"`
EnableVhostUserStore bool `toml:"enable_vhost_user_store"` EnableVhostUserStore bool `toml:"enable_vhost_user_store"`
VhostUserStorePath string `toml:"vhost_user_store_path"` VhostUserStorePath string `toml:"vhost_user_store_path"`
VhostUserStorePathList []string `toml:"vhost_user_store_path_list"` VhostUserStorePathList []string `toml:"valid_vhost_user_store_paths"`
NumVCPUs int32 `toml:"default_vcpus"` NumVCPUs int32 `toml:"default_vcpus"`
DefaultMaxVCPUs uint32 `toml:"default_maxvcpus"` DefaultMaxVCPUs uint32 `toml:"default_maxvcpus"`
MemorySize uint32 `toml:"default_memory"` MemorySize uint32 `toml:"default_memory"`
@ -113,7 +113,7 @@ type hypervisor struct {
IOMMU bool `toml:"enable_iommu"` IOMMU bool `toml:"enable_iommu"`
IOMMUPlatform bool `toml:"enable_iommu_platform"` IOMMUPlatform bool `toml:"enable_iommu_platform"`
FileBackedMemRootDir string `toml:"file_mem_backend"` FileBackedMemRootDir string `toml:"file_mem_backend"`
FileBackedMemRootList []string `toml:"file_mem_backend_list"` FileBackedMemRootList []string `toml:"valid_file_mem_backends"`
Swap bool `toml:"enable_swap"` Swap bool `toml:"enable_swap"`
Debug bool `toml:"enable_debug"` Debug bool `toml:"enable_debug"`
DisableNestingChecks bool `toml:"disable_nesting_checks"` DisableNestingChecks bool `toml:"disable_nesting_checks"`