From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 16 Aug 2023 13:40:03 +0000 (+0200)
Subject: qemu: format uid/gid map for virtiofs
X-Git-Tag: v10.0.0-rc1~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdf96a0f7234b6a6b083da9772f42cb83356ea3c;p=thirdparty%2Flibvirt.git

qemu: format uid/gid map for virtiofs

Pass the ID map to virtiofsd, which will run the suid `newuidmap`
binary for us.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c
index 230f85c291..af51d58673 100644
--- a/src/qemu/qemu_virtiofs.c
+++ b/src/qemu/qemu_virtiofs.c
@@ -131,6 +131,7 @@ qemuVirtioFSBuildCommandLine(virQEMUDriverConfig *cfg,
 {
     g_autoptr(virCommand) cmd = NULL;
     g_auto(virBuffer) opts = VIR_BUFFER_INITIALIZER;
+    size_t i = 4;
 
     cmd = virCommandNew(fs->binary);
 
@@ -169,6 +170,20 @@ qemuVirtioFSBuildCommandLine(virQEMUDriverConfig *cfg,
     if (cfg->virtiofsdDebug)
         virCommandAddArg(cmd, "-d");
 
+    for (i = 0; i < fs->idmap.nuidmap; i++) {
+        virCommandAddArgFormat(cmd, "--uid-map=:%u:%u:%u:",
+                               fs->idmap.uidmap[i].start,
+                               fs->idmap.uidmap[i].target,
+                               fs->idmap.uidmap[i].count);
+    }
+
+    for (i = 0; i < fs->idmap.ngidmap; i++) {
+        virCommandAddArgFormat(cmd, "--gid-map=:%u:%u:%u:",
+                               fs->idmap.gidmap[i].start,
+                               fs->idmap.gidmap[i].target,
+                               fs->idmap.gidmap[i].count);
+    }
+
     return g_steal_pointer(&cmd);
 }