qemu: Install virtiofs with vanilla qemu.

Default kata should provide virtiofs from vanilla qemu.
If users want experimental virtiofs can change to experimental binaries
manually.

Depends-on: github.com/kata-containers/runtime#3122
Depends-on: github.com/kata-containers/tests#3173

Fixes: github.com/kata-containers/runtime#3083

Signed-off-by: Carlos Venegas <[email protected]>

Author: jcvenegas

scripts/configure-hypervisor.sh

@@ -402,9 +402,11 @@ generate_qemu_options() {
 	# (-fsdev "...,security_model=passthrough,..."), qemu uses a helper
 	# application called virtfs-proxy-helper(1) to make certain 9p
 	# operations safer.
+	# seccomp required by virtiofsd
 	qemu_options+=(functionality:--enable-virtfs)
 	qemu_options+=(functionality:--enable-attr)
 	qemu_options+=(functionality:--enable-cap-ng)
+	qemu_options+=(functionality:--enable-seccomp)
 
 	if [[ "${qemu_version_major}" -ge 4 || ( "${qemu_version_major}" -eq 3  &&  "${qemu_version_minor}" -ge 1 ) ]]; then
 		# AVX2 is enabled by default by x86_64, make sure it's enabled only

static-build/qemu-virtiofs/Dockerfile

@@ -67,5 +67,5 @@ RUN make -j$(nproc)
 RUN make -j$(nproc) virtiofsd
 RUN make install DESTDIR=/tmp/qemu-virtiofs-static
 RUN mv /tmp/qemu-virtiofs-static/"${PREFIX}"/bin/qemu-system-x86_64 /tmp/qemu-virtiofs-static/"${PREFIX}"/bin/qemu-virtiofs-system-x86_64
-RUN chmod +x virtiofsd && mv virtiofsd /tmp/qemu-virtiofs-static/opt/kata/bin/
+RUN chmod +x virtiofsd && mv virtiofsd "/tmp/qemu-virtiofs-static/${PREFIX}/bin/virtiofsd-experimental"
 RUN cd /tmp/qemu-virtiofs-static && tar -czvf "${QEMU_TARBALL}"  *

static-build/qemu/Dockerfile

@@ -32,11 +32,12 @@ RUN apt-get --no-install-recommends install -y \
 	    libmount-dev \
 	    libpixman-1-dev \
 	    libpmem-dev \
+	    libseccomp-dev \
+	    libseccomp2 \
 	    libselinux1-dev \
 	    libtool \
 	    make \
 	    pkg-config \
-	    pkg-config \
 	    python \
 	    python-dev \
 	    rsync \
@@ -59,4 +60,8 @@ RUN PREFIX="${PREFIX}" /root/configure-hypervisor.sh -s kata-qemu | xargs ./conf
 
 RUN make -j$(nproc)
 RUN make install DESTDIR=/tmp/qemu-static
+
+RUN make -j$(nproc) virtiofsd
+RUN chmod +x virtiofsd && mv virtiofsd "/tmp/qemu-static/${PREFIX}/bin/"
+
 RUN cd /tmp/qemu-static && tar -czvf "${QEMU_TARBALL}" *