From 97fe749624681aeb31f4cc7d04752c8b6594517b Mon Sep 17 00:00:00 2001
From: Salvador Fuentes <salvador.fuentes@intel.com>
Date: Tue, 17 Sep 2019 15:05:43 -0500
Subject: [PATCH 1/2] config: use 9p as default shared filesystem for nemu

currently virtiofs support is being reworked to use qemu
and kernel from virtio-fs gitlab repo. The current support
that we have for virtio-fs has been disabled as required
patches for the 4.19 kernel were removed in [1].

[1] https://github.com/kata-containers/packaging/pull/703

Fixes: #2048.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
---
 Makefile                              | 2 +-
 cli/config/configuration-nemu.toml.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index a7a9306239..f0d3bd1093 100644
--- a/Makefile
+++ b/Makefile
@@ -172,7 +172,7 @@ DEFENTROPYSOURCE := /dev/urandom
 
 DEFDISABLEBLOCK := false
 DEFSHAREDFS := virtio-9p
-DEFSHAREDFS_NEMU := virtio-fs
+DEFSHAREDFS_NEMU := virtio-9p
 DEFVIRTIOFSDAEMON := $(VIRTIOFSDBINDIR)/virtiofsd-x86_64
 # Default DAX mapping cache size in MiB
 DEFVIRTIOFSCACHESIZE := 1024
diff --git a/cli/config/configuration-nemu.toml.in b/cli/config/configuration-nemu.toml.in
index dda6ae9725..09cc5a8f17 100644
--- a/cli/config/configuration-nemu.toml.in
+++ b/cli/config/configuration-nemu.toml.in
@@ -98,8 +98,8 @@ default_memory = @DEFMEMSZ@
 disable_block_device_use = @DEFDISABLEBLOCK@
 
 # Shared file system type:
-#   - virtio-fs (default)
-#   - virtio-9p
+#   - virtio-9p (default)
+#   - virtio-fs
 shared_fs = "@DEFSHAREDFS_NEMU@"
 
 # Path to vhost-user-fs daemon.

From 4134571e86ac7736f722a6937ce54fdced85ce11 Mon Sep 17 00:00:00 2001
From: Salvador Fuentes <salvador.fuentes@intel.com>
Date: Wed, 18 Sep 2019 11:31:13 -0500
Subject: [PATCH 2/2] 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 <salvador.fuentes@intel.com>
---
 Makefile                                       | 1 +
 cli/config/configuration-qemu-virtiofs.toml.in | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index f0d3bd1093..4ccacc5940 100644
--- 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
index 8f5a618ca9..55cc045c42 100644
--- 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@"