From 188424a18a7800a051547b2493ff65e71eeeb3d3 Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Mon, 11 Jan 2021 14:55:45 -0800 Subject: [PATCH] vendor: update govmm from intel to kata-containers Let's keep aligned with Kata 2.0, and utilize the kata-container organizations' govmm. Fixes: #3000 Signed-off-by: Eric Ernst --- Gopkg.lock | 16 ++++++++-------- Gopkg.toml | 2 +- pkg/katautils/config.go | 2 +- .../{intel => kata-containers}/govmm/COPYING | 0 .../govmm/qemu/image.go | 0 .../govmm/qemu/qemu.go | 0 .../{intel => kata-containers}/govmm/qemu/qmp.go | 0 virtcontainers/qemu.go | 2 +- virtcontainers/qemu_amd64.go | 2 +- virtcontainers/qemu_amd64_test.go | 2 +- virtcontainers/qemu_arch_base.go | 2 +- virtcontainers/qemu_arch_base_test.go | 2 +- virtcontainers/qemu_arm64.go | 2 +- virtcontainers/qemu_arm64_test.go | 2 +- virtcontainers/qemu_ppc64le.go | 2 +- virtcontainers/qemu_ppc64le_test.go | 2 +- virtcontainers/qemu_s390x.go | 2 +- virtcontainers/qemu_s390x_test.go | 2 +- virtcontainers/qemu_test.go | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) rename vendor/github.com/{intel => kata-containers}/govmm/COPYING (100%) rename vendor/github.com/{intel => kata-containers}/govmm/qemu/image.go (100%) rename vendor/github.com/{intel => kata-containers}/govmm/qemu/qemu.go (100%) rename vendor/github.com/{intel => kata-containers}/govmm/qemu/qmp.go (100%) diff --git a/Gopkg.lock b/Gopkg.lock index 1ed2ef2673..5ce8a52921 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -419,13 +419,6 @@ pruneopts = "NUT" revision = "2f1d1f20f75d5404f53b9edf6b53ed5505508675" -[[projects]] - digest = "1:647e03799be4f4878fa6deb1656f1c172c13d1e31b3aaf96384755006c94ded9" - name = "github.com/intel/govmm" - packages = ["qemu"] - pruneopts = "NUT" - revision = "5e9aa08c4fd1201d65c6dd1136c8ab70ff17ee82" - [[projects]] digest = "1:ee3d719407ec4bd877eaa4da37e2935298c3d9029ec3c20e502c0e14768b754c" name = "github.com/kata-containers/agent" @@ -437,6 +430,13 @@ pruneopts = "NUT" revision = "f9eab0fe9adb34e4f9f4a11f42a3eff983fd0659" +[[projects]] + digest = "1:647e03799be4f4878fa6deb1656f1c172c13d1e31b3aaf96384755006c94ded9" + name = "github.com/kata-containers/govmm" + packages = ["qemu"] + pruneopts = "NUT" + revision = "5e9aa08c4fd1201d65c6dd1136c8ab70ff17ee82" + [[projects]] digest = "1:58999a98719fddbac6303cb17e8d85b945f60b72f48e3a2df6b950b97fa926f1" name = "github.com/konsorten/go-windows-terminal-sequences" @@ -821,10 +821,10 @@ "github.com/gogo/protobuf/proto", "github.com/gogo/protobuf/types", "github.com/hashicorp/go-multierror", - "github.com/intel/govmm/qemu", "github.com/kata-containers/agent/pkg/types", "github.com/kata-containers/agent/protocols/client", "github.com/kata-containers/agent/protocols/grpc", + "github.com/kata-containers/govmm/qemu", "github.com/mitchellh/mapstructure", "github.com/opencontainers/runc/libcontainer/cgroups", "github.com/opencontainers/runc/libcontainer/cgroups/fs", diff --git a/Gopkg.toml b/Gopkg.toml index 879effcaf8..e74f0f5807 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -47,7 +47,7 @@ revision = "v1.4.2" [[constraint]] - name = "github.com/intel/govmm" + name = "github.com/kata-containers/govmm" revision = "5e9aa08c4fd1201d65c6dd1136c8ab70ff17ee82" [[constraint]] diff --git a/pkg/katautils/config.go b/pkg/katautils/config.go index 28f973d7eb..af0fe82b1e 100644 --- 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/COPYING b/vendor/github.com/kata-containers/govmm/COPYING similarity index 100% rename from vendor/github.com/intel/govmm/COPYING rename to vendor/github.com/kata-containers/govmm/COPYING diff --git a/vendor/github.com/intel/govmm/qemu/image.go b/vendor/github.com/kata-containers/govmm/qemu/image.go similarity index 100% rename from vendor/github.com/intel/govmm/qemu/image.go rename to vendor/github.com/kata-containers/govmm/qemu/image.go diff --git a/vendor/github.com/intel/govmm/qemu/qemu.go b/vendor/github.com/kata-containers/govmm/qemu/qemu.go similarity index 100% rename from vendor/github.com/intel/govmm/qemu/qemu.go rename to vendor/github.com/kata-containers/govmm/qemu/qemu.go diff --git a/vendor/github.com/intel/govmm/qemu/qmp.go b/vendor/github.com/kata-containers/govmm/qemu/qmp.go similarity index 100% rename from vendor/github.com/intel/govmm/qemu/qmp.go rename to vendor/github.com/kata-containers/govmm/qemu/qmp.go diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go index 9ceb5473ea..baf47e1a29 100644 --- a/virtcontainers/qemu.go +++ b/virtcontainers/qemu.go @@ -24,7 +24,7 @@ import ( "time" "unsafe" - govmmQemu "github.com/intel/govmm/qemu" + govmmQemu "github.com/kata-containers/govmm/qemu" "github.com/opencontainers/selinux/go-selinux/label" "github.com/opentracing/opentracing-go" "github.com/pkg/errors" diff --git a/virtcontainers/qemu_amd64.go b/virtcontainers/qemu_amd64.go index ac7bc693de..cf00da70b1 100644 --- a/virtcontainers/qemu_amd64.go +++ b/virtcontainers/qemu_amd64.go @@ -10,7 +10,7 @@ import ( "github.com/kata-containers/runtime/virtcontainers/types" - govmmQemu "github.com/intel/govmm/qemu" + govmmQemu "github.com/kata-containers/govmm/qemu" ) type qemuAmd64 struct { diff --git a/virtcontainers/qemu_amd64_test.go b/virtcontainers/qemu_amd64_test.go index 4524788faf..50e9fdc8ed 100644 --- a/virtcontainers/qemu_amd64_test.go +++ b/virtcontainers/qemu_amd64_test.go @@ -11,7 +11,7 @@ import ( "os" "testing" - govmmQemu "github.com/intel/govmm/qemu" + govmmQemu "github.com/kata-containers/govmm/qemu" "github.com/kata-containers/runtime/virtcontainers/types" "github.com/stretchr/testify/assert" ) diff --git a/virtcontainers/qemu_arch_base.go b/virtcontainers/qemu_arch_base.go index 0abb9d14ff..36ac64b812 100644 --- a/virtcontainers/qemu_arch_base.go +++ b/virtcontainers/qemu_arch_base.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - govmmQemu "github.com/intel/govmm/qemu" + govmmQemu "github.com/kata-containers/govmm/qemu" "github.com/kata-containers/runtime/virtcontainers/device/config" "github.com/kata-containers/runtime/virtcontainers/types" diff --git a/virtcontainers/qemu_arch_base_test.go b/virtcontainers/qemu_arch_base_test.go index 06c38294ef..cbf6f3b51d 100644 --- a/virtcontainers/qemu_arch_base_test.go +++ b/virtcontainers/qemu_arch_base_test.go @@ -13,7 +13,7 @@ import ( "path/filepath" "testing" - govmmQemu "github.com/intel/govmm/qemu" + govmmQemu "github.com/kata-containers/govmm/qemu" "github.com/stretchr/testify/assert" "github.com/kata-containers/runtime/virtcontainers/device/config" diff --git a/virtcontainers/qemu_arm64.go b/virtcontainers/qemu_arm64.go index aa6634de3b..aea67f323f 100644 --- a/virtcontainers/qemu_arm64.go +++ b/virtcontainers/qemu_arm64.go @@ -10,7 +10,7 @@ import ( "fmt" "time" - govmmQemu "github.com/intel/govmm/qemu" + govmmQemu "github.com/kata-containers/govmm/qemu" "github.com/kata-containers/runtime/virtcontainers/types" ) diff --git a/virtcontainers/qemu_arm64_test.go b/virtcontainers/qemu_arm64_test.go index c53c2e3b11..7027538952 100644 --- a/virtcontainers/qemu_arm64_test.go +++ b/virtcontainers/qemu_arm64_test.go @@ -11,7 +11,7 @@ import ( "os" "testing" - govmmQemu "github.com/intel/govmm/qemu" + govmmQemu "github.com/kata-containers/govmm/qemu" "github.com/stretchr/testify/assert" ) diff --git a/virtcontainers/qemu_ppc64le.go b/virtcontainers/qemu_ppc64le.go index ea9a6f58af..0ebc086e92 100644 --- a/virtcontainers/qemu_ppc64le.go +++ b/virtcontainers/qemu_ppc64le.go @@ -9,7 +9,7 @@ import ( "fmt" "time" - govmmQemu "github.com/intel/govmm/qemu" + govmmQemu "github.com/kata-containers/govmm/qemu" "github.com/kata-containers/runtime/virtcontainers/types" "github.com/sirupsen/logrus" ) diff --git a/virtcontainers/qemu_ppc64le_test.go b/virtcontainers/qemu_ppc64le_test.go index 9a4783e041..b1cb4e2593 100644 --- a/virtcontainers/qemu_ppc64le_test.go +++ b/virtcontainers/qemu_ppc64le_test.go @@ -12,7 +12,7 @@ import ( "strconv" "testing" - govmmQemu "github.com/intel/govmm/qemu" + govmmQemu "github.com/kata-containers/govmm/qemu" "github.com/stretchr/testify/assert" ) diff --git a/virtcontainers/qemu_s390x.go b/virtcontainers/qemu_s390x.go index 155a3b6b34..8cbceef0f6 100644 --- a/virtcontainers/qemu_s390x.go +++ b/virtcontainers/qemu_s390x.go @@ -9,7 +9,7 @@ import ( "fmt" "time" - govmmQemu "github.com/intel/govmm/qemu" + govmmQemu "github.com/kata-containers/govmm/qemu" "github.com/kata-containers/runtime/virtcontainers/device/config" "github.com/kata-containers/runtime/virtcontainers/types" ) diff --git a/virtcontainers/qemu_s390x_test.go b/virtcontainers/qemu_s390x_test.go index fb491ce146..0649598025 100644 --- a/virtcontainers/qemu_s390x_test.go +++ b/virtcontainers/qemu_s390x_test.go @@ -9,7 +9,7 @@ import ( "fmt" "testing" - govmmQemu "github.com/intel/govmm/qemu" + govmmQemu "github.com/kata-containers/govmm/qemu" "github.com/kata-containers/runtime/virtcontainers/device/config" "github.com/stretchr/testify/assert" ) diff --git a/virtcontainers/qemu_test.go b/virtcontainers/qemu_test.go index cc03d81dbe..7a39fc5a8b 100644 --- a/virtcontainers/qemu_test.go +++ b/virtcontainers/qemu_test.go @@ -14,7 +14,7 @@ import ( "strings" "testing" - govmmQemu "github.com/intel/govmm/qemu" + govmmQemu "github.com/kata-containers/govmm/qemu" "github.com/kata-containers/runtime/virtcontainers/device/config" "github.com/kata-containers/runtime/virtcontainers/persist" "github.com/kata-containers/runtime/virtcontainers/types"