From 810abd67c4b7de188bce95303c0b52c1a7c3a946 Mon Sep 17 00:00:00 2001
From: Julio Montes <julio.montes@intel.com>
Date: Wed, 7 Aug 2019 16:48:39 +0000
Subject: [PATCH] snap: support rootfs image

Use the rootfs image by defult since performance is better,
smaller memory footprint and boot time.

fixes #667

Signed-off-by: Julio Montes <julio.montes@intel.com>
---
 ...ile-nvdimm-support-read-only-files-a.patch | 43 +++++++++++++++++++
 snap/snapcraft.yaml                           |  9 ++--
 2 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 qemu/patches/4.0.x/0003-memory-backend-file-nvdimm-support-read-only-files-a.patch

diff --git a/qemu/patches/4.0.x/0003-memory-backend-file-nvdimm-support-read-only-files-a.patch b/qemu/patches/4.0.x/0003-memory-backend-file-nvdimm-support-read-only-files-a.patch
new file mode 100644
index 0000000000..f44a525ca1
--- /dev/null
+++ b/qemu/patches/4.0.x/0003-memory-backend-file-nvdimm-support-read-only-files-a.patch
@@ -0,0 +1,43 @@
+From bf71d7d8e04e85517578c021804c77739f9fed72 Mon Sep 17 00:00:00 2001
+From: Julio Montes <julio.montes@intel.com>
+Date: Mon, 8 Jul 2019 21:19:36 +0000
+Subject: [PATCH] memory-backend-file/nvdimm: support read-only files as
+ memory-backends
+
+Currently is not possible to use a file that is part of a read-only
+filesystem as memory backend for nvdimm devices, even if this is not modified
+in the guest. In order to improve the security of Virtual Machines that share
+and do not modify the memory-backend-file, QEMU should support
+read-only memory-backeds.
+
+Use case:
+* Kata Containers use a memory-backed-file as read-only rootfs, and this
+  file is used to start all the virtual machines in the node.
+  It would be really bad if somehow a malicious container modified it.
+
+Signed-off-by: Julio Montes <julio.montes@intel.com>
+Message-Id: <20190708211936.8037-1-julio.montes@intel.com>
+---
+ exec.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/exec.c b/exec.c
+index 3e78de3b8f..a1b6f939fb 100644
+--- a/exec.c
++++ b/exec.c
+@@ -1865,6 +1865,12 @@ static int file_ram_open(const char *path,
+                 break;
+             }
+             g_free(filename);
++        } else if (errno == EROFS) {
++            fd = open(path, O_RDONLY);
++            if (fd >= 0) {
++                /* @path names an existing read-only file, use it */
++                break;
++            }
+         }
+         if (errno != EEXIST && errno != EINTR) {
+             error_setg_errno(errp, errno,
+-- 
+2.17.2
+
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 4c53e88277..2a30a3dbe6 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -90,9 +90,8 @@ parts:
         SKIP_GO_VERSION_CHECK=1 \
         QEMUCMD=qemu-system-$arch
 
-      # A snap is read-only squashfs, unfourtunately it's not possible to use the rootfs image with DAX
-      # since rw access is required therefore initrd image must be used instead.
-      sed -i -e '/^image =/d' ${SNAPCRAFT_PART_INSTALL}/usr/share/defaults/${SNAPCRAFT_PROJECT_NAME}/configuration.toml
+      # Set rootfs image by default
+      sed -i -e '/^initrd =/d' ${SNAPCRAFT_PART_INSTALL}/usr/share/defaults/${SNAPCRAFT_PROJECT_NAME}/configuration.toml
 
   proxy:
     after: [go]
@@ -182,11 +181,11 @@ parts:
       git clone -b ${SNAPCRAFT_PROJECT_VERSION} https://github.com/kata-containers/${pkg_name} ${pkg_gopath}
       cd ${pkg_gopath}
 
-      sudo -E PATH=$PATH make AGENT_VERSION=${SNAPCRAFT_PROJECT_VERSION} DISTRO=alpine AGENT_INIT=yes USE_DOCKER=1 initrd
+      sudo -E PATH=$PATH make AGENT_VERSION=${SNAPCRAFT_PROJECT_VERSION} DISTRO=clearlinux AGENT_INIT=yes USE_DOCKER=1 image
 
       kata_image_dir=${SNAPCRAFT_PART_INSTALL}/usr/share/kata-containers
       mkdir -p ${kata_image_dir}
-      cp kata-containers-initrd.img ${kata_image_dir}
+      cp kata-containers.img ${kata_image_dir}
 
   ksm-throttler:
     after: [go]