From 3c415d93fe6e2e8d8a1e18cc4f6d4dc0d22c5167 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Fri, 24 Jul 2020 13:26:56 -0500 Subject: [PATCH] virtcontainers: 9p: shares multiple devices with only one export Use 'remap' behaviour to deal with multiple devices being shared with a 9p export. Fixes the following warning: ``` 9p: Multiple devices detected in same VirtFS export, which might lead to file ID collisions and severe misbehaviours on guest! You should either use a separate export for each device shared from host or use virtfs option 'multidevs=remap'! ``` fixes #378 Signed-off-by: Julio Montes --- src/runtime/virtcontainers/qemu_arch_base.go | 1 + src/runtime/virtcontainers/qemu_arch_base_test.go | 1 + src/runtime/virtcontainers/qemu_test.go | 1 + 3 files changed, 3 insertions(+) diff --git a/src/runtime/virtcontainers/qemu_arch_base.go b/src/runtime/virtcontainers/qemu_arch_base.go index 5ed1154ea5..e2ab23607e 100644 --- a/src/runtime/virtcontainers/qemu_arch_base.go +++ b/src/runtime/virtcontainers/qemu_arch_base.go @@ -460,6 +460,7 @@ func generic9PVolume(volume types.Volume, nestedRun bool) govmmQemu.FSDevice { MountTag: volume.MountTag, SecurityModel: govmmQemu.None, DisableModern: nestedRun, + Multidev: govmmQemu.Remap, } } diff --git a/src/runtime/virtcontainers/qemu_arch_base_test.go b/src/runtime/virtcontainers/qemu_arch_base_test.go index 475aa8221a..d4a3b345a2 100644 --- a/src/runtime/virtcontainers/qemu_arch_base_test.go +++ b/src/runtime/virtcontainers/qemu_arch_base_test.go @@ -329,6 +329,7 @@ func TestQemuArchBaseAppend9PVolume(t *testing.T) { Path: hostPath, MountTag: mountTag, SecurityModel: govmmQemu.None, + Multidev: govmmQemu.Remap, }, } diff --git a/src/runtime/virtcontainers/qemu_test.go b/src/runtime/virtcontainers/qemu_test.go index f8ca346607..9d13988d4f 100644 --- a/src/runtime/virtcontainers/qemu_test.go +++ b/src/runtime/virtcontainers/qemu_test.go @@ -211,6 +211,7 @@ func TestQemuAddDeviceFsDev(t *testing.T) { Path: hostPath, MountTag: mountTag, SecurityModel: govmmQemu.None, + Multidev: govmmQemu.Remap, }, }