github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-29 00:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2066 from chavafg/topic/nemu-9p

Browse Source 
config: use 9p as default shared filesystem for nemu
This commit is contained in:
GabyCT 2019-09-18 15:12:35 -05:00 committed by GitHub
commit 46e1880c8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -172,7 +172,8 @@ DEFENTROPYSOURCE := /dev/urandom
DEFDISABLEBLOCK := false DEFDISABLEBLOCK := false
DEFSHAREDFS := virtio-9p DEFSHAREDFS := virtio-9p
DEFSHAREDFS_NEMU := virtio-fs 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

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

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

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@"