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

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 <[email protected]>
kata-containers · Sep 18, 2019 · 4134571 · 4134571
1 parent 97fe749
commit 4134571
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -173,6 +173,7 @@ DEFENTROPYSOURCE := /dev/urandom
 DEFDISABLEBLOCK := false
 DEFSHAREDFS := virtio-9p
 DEFSHAREDFS_NEMU := virtio-9p
+DEFSHAREDFS_QEMU_VIRTIOFS := virtios-fs
 DEFVIRTIOFSDAEMON := $(VIRTIOFSDBINDIR)/virtiofsd-x86_64
 # Default DAX mapping cache size in MiB
 DEFVIRTIOFSCACHESIZE := 1024

diff --git a/cli/config/configuration-qemu-virtiofs.toml.in b/cli/config/configuration-qemu-virtiofs.toml.in
@@ -98,9 +98,9 @@ default_memory = @DEFMEMSZ@
 disable_block_device_use = @DEFDISABLEBLOCK@
 
 # Shared file system type:
-#   - virtio-9p (default)
-#   - virtio-fs
-shared_fs = "@DEFSHAREDFS_NEMU@"
+#   - virtio-fs (default)
+#   - virtio-9p
+shared_fs = "@DEFSHAREDFS_QEMU_VIRTIOFS@"
 
 # Path to vhost-user-fs daemon.
 virtio_fs_daemon = "@DEFVIRTIOFSDAEMON@"