github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 16:27:50 +00:00
Code Issues Projects Releases Wiki Activity

config: do not use nemu variable for qemu-virtiofs configuration

Browse Source 
instead of using `DEFSHAREDFS_NEMU` in `configuration-qemu-virtiofs.toml`,
use `DEFSHAREDFS_QEMU_VIRTIOFS`.
nemu will be deprecated soon so using `DEFSHAREDFS_NEMU` may
brake the configuration for qemu-virtiofs.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
This commit is contained in:
Salvador Fuentes 2019-09-18 11:31:13 -05:00
parent 97fe749624
commit 4134571e86
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -173,6 +173,7 @@ DEFENTROPYSOURCE := /dev/urandom
DEFDISABLEBLOCK := false DEFDISABLEBLOCK := false
DEFSHAREDFS := virtio-9p DEFSHAREDFS := virtio-9p
DEFSHAREDFS_NEMU := virtio-9p DEFSHAREDFS_NEMU := virtio-9p
DEFSHAREDFS_QEMU_VIRTIOFS := virtios-fs
DEFVIRTIOFSDAEMON := $(VIRTIOFSDBINDIR)/virtiofsd-x86_64 DEFVIRTIOFSDAEMON := $(VIRTIOFSDBINDIR)/virtiofsd-x86_64
# Default DAX mapping cache size in MiB # Default DAX mapping cache size in MiB
DEFVIRTIOFSCACHESIZE := 1024 DEFVIRTIOFSCACHESIZE := 1024

6
cli/config/configuration-qemu-virtiofs.toml.in
View File

@ -98,9 +98,9 @@ default_memory = @DEFMEMSZ@
disable_block_device_use = @DEFDISABLEBLOCK@ disable_block_device_use = @DEFDISABLEBLOCK@
# Shared file system type: # Shared file system type:
# - virtio-9p (default) # - virtio-fs (default)
# - virtio-fs # - virtio-9p
shared_fs = "@DEFSHAREDFS_NEMU@" shared_fs = "@DEFSHAREDFS_QEMU_VIRTIOFS@"
# Path to vhost-user-fs daemon. # Path to vhost-user-fs daemon.
virtio_fs_daemon = "@DEFVIRTIOFSDAEMON@" virtio_fs_daemon = "@DEFVIRTIOFSDAEMON@"