scripts/qemu: enable libpmem

Enable libpmem to support PMEM when running under Kubernetes. see kata-containers/runtime#2262 According to QEMU's nvdimm documentation: When 'pmem' is 'on' and QEMU is built with libpmem support, QEMU will take necessary operations to guarantee the persistence of its own writes to the vNVDIMM backend. fixes #958 Signed-off-by: Julio Montes <[email protected]>
kata-containers · Feb 28, 2020 · 120593e · 120593e
1 parent 9a37ebe
commit 120593e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/obs-packaging/qemu-vanilla/debian.control-template b/obs-packaging/qemu-vanilla/debian.control-template
@@ -2,7 +2,7 @@ Source: qemu-vanilla
 Section: devel
 Priority: optional
 Maintainer: Kata containers team <https://github.com/kata-containers/>
-Build-Depends: debhelper (>= 9), cpio, libelf-dev, rsync, libdw-dev, pkg-config, flex, bison, libaudit-dev, bc, python-dev, gawk, autoconf, automake, libtool, libltdl-dev, libglib2.0-dev, libglib2.0-0, libcap-dev, libcap-ng-dev, libattr1-dev, m4, libnuma-dev, zlib1g-dev, libpixman-1-0, libpixman-1-dev
+Build-Depends: debhelper (>= 9), cpio, libelf-dev, rsync, libdw-dev, pkg-config, flex, bison, libaudit-dev, bc, python-dev, gawk, autoconf, automake, libtool, libltdl-dev, libglib2.0-dev, libglib2.0-0, libcap-dev, libcap-ng-dev, libattr1-dev, m4, libnuma-dev, zlib1g-dev, libpixman-1-0, libpixman-1-dev, libpmem-dev
 Standards-Version: 3.9.6
 Homepage: https://katacontainers.io
 
@@ -11,4 +11,3 @@ Architecture: @deb_arch@
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
 Description: linux kernel optimised for container-like workloads.
  Linux kernel optimised for container-like workloads
-
diff --git a/obs-packaging/qemu-vanilla/qemu-vanilla.spec-template b/obs-packaging/qemu-vanilla/qemu-vanilla.spec-template
@@ -47,6 +47,7 @@ BuildRequires : python
 BuildRequires : python-devel
 BuildRequires : zlib-devel
 BuildRequires : pkgconfig(pixman-1)
+BuildRequires : libpmem-devel
 
 # Patches
 @RPM_PATCH_LIST@

diff --git a/scripts/configure-hypervisor.sh b/scripts/configure-hypervisor.sh
@@ -330,10 +330,6 @@ generate_qemu_options() {
 	qemu_options+=(size:--disable-linux-aio)
 
 	if [[ "${qemu_version_major}" -ge 4 || ( "${qemu_version_major}" -eq 3  &&  "${qemu_version_minor}" -ge 1 ) ]]; then
-		# Disable libpmem, vNVDIMM backend (aka rootfs image) shouldn't be modifed
-		# by the guest
-		qemu_options+=(security:--disable-libpmem)
-
 		# Disable graphics
 		qemu_options+=(size:--disable-virglrenderer)
 
@@ -396,6 +392,11 @@ generate_qemu_options() {
 		fi
 		# Enable libc malloc_trim() for memory optimization.
 		qemu_options+=(speed:--enable-malloc-trim)
+
+		# According to QEMU's nvdimm documentation: When 'pmem' is 'on' and QEMU is
+		# built with libpmem support, QEMU will take necessary operations to guarantee
+		# the persistence of its own writes to the vNVDIMM backend.
+		qemu_options+=(functionality:--enable-libpmem)
 	fi
 
 	#---------------------------------------------------------------------