Merge pull request #3117 from egernst/stable-backport-ro-blk

Pass block as RO if appropriate
kata-containers · Jan 13, 2021 · 2c672f4 · 2c672f4
2 parents 7b0472d + f4cf009
commit 2c672f4
Show file tree

Hide file tree

Showing 26 changed files with 288 additions and 114 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -47,8 +47,8 @@
   revision = "v1.4.2"
 
 [[constraint]]
-  name = "github.com/intel/govmm"
-  revision = "547a8518098aaa71c5d5d7a370f211e00161016b"
+  name = "github.com/kata-containers/govmm"
+  revision = "7d320e8f5dcad260c1723bda3bff21539750d51f"
 
 [[constraint]]
   name = "github.com/kata-containers/agent"

diff --git a/pkg/katautils/config.go b/pkg/katautils/config.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 
 	"github.com/BurntSushi/toml"
-	govmmQemu "github.com/intel/govmm/qemu"
+	govmmQemu "github.com/kata-containers/govmm/qemu"
 	vc "github.com/kata-containers/runtime/virtcontainers"
 	"github.com/kata-containers/runtime/virtcontainers/device/config"
 	exp "github.com/kata-containers/runtime/virtcontainers/experimental"

diff --git a/vendor/github.com/intel/govmm/CONTRIBUTORS.md b/vendor/github.com/intel/govmm/CONTRIBUTORS.md
diff --git a/vendor/github.com/intel/govmm/COPYING → .../github.com/kata-containers/govmm/COPYING b/vendor/github.com/intel/govmm/COPYING → .../github.com/kata-containers/govmm/COPYING
diff --git a/vendor/github.com/intel/govmm/qemu/image.go → ...b.com/kata-containers/govmm/qemu/image.go b/vendor/github.com/intel/govmm/qemu/image.go → ...b.com/kata-containers/govmm/qemu/image.go
diff --git a/vendor/github.com/intel/govmm/qemu/qemu.go → ...ub.com/kata-containers/govmm/qemu/qemu.go b/vendor/github.com/intel/govmm/qemu/qemu.go → ...ub.com/kata-containers/govmm/qemu/qemu.go
diff --git a/vendor/github.com/intel/govmm/qemu/qmp.go → ...hub.com/kata-containers/govmm/qemu/qmp.go b/vendor/github.com/intel/govmm/qemu/qmp.go → ...hub.com/kata-containers/govmm/qemu/qmp.go