Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
vendor: update govmm from intel to kata-containers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
egernst committed Jan 13, 2021
1 parent 7b0472d commit a8d2089
Show file tree
Hide file tree
Showing 20 changed files with 163 additions and 47 deletions.
16 changes: 8 additions & 8 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Gopkg.toml
Expand Up @@ -47,8 +47,8 @@
revision = "v1.4.2"

[[constraint]]
name = "github.com/intel/govmm"
revision = "547a8518098aaa71c5d5d7a370f211e00161016b"
name = "github.com/kata-containers/govmm"
revision = "5e9aa08c4fd1201d65c6dd1136c8ab70ff17ee82"

[[constraint]]
name = "github.com/kata-containers/agent"
Expand Down
2 changes: 1 addition & 1 deletion pkg/katautils/config.go
Expand Up @@ -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"
Expand Down
22 changes: 0 additions & 22 deletions vendor/github.com/intel/govmm/CONTRIBUTORS.md

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion virtcontainers/qemu.go
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion virtcontainers/qemu_amd64.go
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion virtcontainers/qemu_amd64_test.go
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion virtcontainers/qemu_arch_base.go
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion virtcontainers/qemu_arch_base_test.go
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion virtcontainers/qemu_arm64.go
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
2 changes: 1 addition & 1 deletion virtcontainers/qemu_arm64_test.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion virtcontainers/qemu_ppc64le.go
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion virtcontainers/qemu_ppc64le_test.go
Expand Up @@ -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"
)

Expand Down

0 comments on commit a8d2089

Please sign in to comment.