From 994a72e531aa4c4207c74c05a02a16a8f66ed206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
Date: Tue, 23 Jan 2024 22:44:41 -0500
Subject: [PATCH] incusd/instance/qemu/agent-loader: Remove virtiofs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
---
 internal/server/instance/drivers/agent-loader/incus-agent | 8 ++------
 .../instance/drivers/agent-loader/incus-agent-setup       | 6 +-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/internal/server/instance/drivers/agent-loader/incus-agent b/internal/server/instance/drivers/agent-loader/incus-agent
index 5853daef87e..01989f45cc5 100644
--- a/internal/server/instance/drivers/agent-loader/incus-agent
+++ b/internal/server/instance/drivers/agent-loader/incus-agent
@@ -3,17 +3,13 @@ PREFIX="/run/incus_agent"
 mkdir -p "${PREFIX}/.mnt"
 
 # Functions.
-mount_virtiofs() {
-    mount -t virtiofs agent "${PREFIX}/.mnt" -o ro >/dev/null 2>&1
-}
-
 mount_9p() {
     modprobe 9pnet_virtio >/dev/null 2>&1 || true
     mount -t 9p agent "${PREFIX}/.mnt" -o ro,access=0,trans=virtio,size=1048576 >/dev/null 2>&1
 }
 
 # Mount the agent share.
-mount_virtiofs || mount_9p || fail "Couldn't mount virtiofs or 9p, failing."
+mount_9p || fail "Couldn't mount 9p, failing."
 
 # Transfer the agent binary.
 rm -f "${PREFIX}/incus-agent"
@@ -24,4 +20,4 @@ umount "${PREFIX}/.mnt"
 rmdir "${PREFIX}/.mnt"
 
 # Re-exec the agent.
-exec "${PREFIX}/incus-agent" "$@"
\ No newline at end of file
+exec "${PREFIX}/incus-agent" "$@"
diff --git a/internal/server/instance/drivers/agent-loader/incus-agent-setup b/internal/server/instance/drivers/agent-loader/incus-agent-setup
index 6de6e0f67b6..7fc7ad069b8 100644
--- a/internal/server/instance/drivers/agent-loader/incus-agent-setup
+++ b/internal/server/instance/drivers/agent-loader/incus-agent-setup
@@ -3,10 +3,6 @@ set -eu
 PREFIX="/run/incus_agent"
 
 # Functions.
-mount_virtiofs() {
-    mount -t virtiofs config "${PREFIX}/.mnt" -o ro >/dev/null 2>&1
-}
-
 mount_9p() {
     modprobe 9pnet_virtio >/dev/null 2>&1 || true
     mount -t 9p config "${PREFIX}/.mnt" -o ro,access=0,trans=virtio,size=1048576 >/dev/null 2>&1
@@ -26,7 +22,7 @@ mount -t tmpfs tmpfs "${PREFIX}" -o mode=0700,nodev,nosuid,noatime,size=25M
 mkdir -p "${PREFIX}/.mnt"
 
 # Try virtiofs first.
-mount_virtiofs || mount_9p || fail "Couldn't mount virtiofs or 9p, failing."
+mount_9p || fail "Couldn't mount 9p, failing."
 
 # Copy the data.
 cp -Ra --no-preserve=ownership "${PREFIX}/.mnt/"* "${PREFIX}"