Merge pull request #2861 from devimc/2020-07-27/fix9pMultidevs

virtcontainers: 9p: shares multiple devices with only one export
kata-containers · Jul 28, 2020 · e75299c · e75299c
2 parents 032d537 + 695fa43
commit e75299c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 3 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -48,7 +48,7 @@
 
 [[constraint]]
   name = "github.com/intel/govmm"
-  revision = "7cc469641b7b4e541b56908849348b2dabbaf6a1"
+  revision = "af9e34b91ae99aff4b4ac126141259d34d98e9f2"
 
 [[constraint]]
   name = "github.com/kata-containers/agent"

diff --git a/vendor/github.com/intel/govmm/qemu/qemu.go b/vendor/github.com/intel/govmm/qemu/qemu.go
diff --git a/virtcontainers/qemu_arch_base.go b/virtcontainers/qemu_arch_base.go
@@ -472,6 +472,7 @@ func generic9PVolume(volume types.Volume, nestedRun bool) govmmQemu.FSDevice {
 		MountTag:      volume.MountTag,
 		SecurityModel: govmmQemu.None,
 		DisableModern: nestedRun,
+		Multidev:      govmmQemu.Remap,
 	}
 }
 

diff --git a/virtcontainers/qemu_arch_base_test.go b/virtcontainers/qemu_arch_base_test.go
@@ -353,6 +353,7 @@ func TestQemuArchBaseAppend9PVolume(t *testing.T) {
 			Path:          hostPath,
 			MountTag:      mountTag,
 			SecurityModel: govmmQemu.None,
+			Multidev:      govmmQemu.Remap,
 		},
 	}
 

diff --git a/virtcontainers/qemu_test.go b/virtcontainers/qemu_test.go
@@ -211,6 +211,7 @@ func TestQemuAddDeviceFsDev(t *testing.T) {
 			Path:          hostPath,
 			MountTag:      mountTag,
 			SecurityModel: govmmQemu.None,
+			Multidev:      govmmQemu.Remap,
 		},
 	}