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 <eric.g.ernst@gmail.com>
kata-containers · Jan 11, 2021 · 188424a · 188424a
1 parent 082291a
commit 188424a
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 22 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git 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
@@ -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 → .../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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
-Original file line number
+Diff line change
@@ Expand Up / @@ -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"
     )
@@ Expand Down @@