diff --git a/Gopkg.lock b/Gopkg.lock index dad0bb45d..a7a9c88e9 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -123,11 +123,11 @@ revision = "3520598351bb3500a49ae9563f5539666ae0a27c" [[projects]] - digest = "1:7434a85a1d6c2bf64f322087ec7a7f84ab9e971179bef7b95deabaf0e3f7c126" + digest = "1:2b062c3645f86b71bdb0487b4d69746704695fc09158fe4638c213d38c6cc5dc" name = "github.com/intel/govmm" packages = ["qemu"] pruneopts = "NUT" - revision = "e2c716433e444017507e3587ce071868fd164380" + revision = "032705ba6aae05a9bf41e296cf89c8529cffb822" [[projects]] digest = "1:01c37fcb6e2a1fe1321a97faaef74c66ac531ea292ca3f929b7189cc400b1d47" diff --git a/Gopkg.toml b/Gopkg.toml index 5491364d2..c5ea29b91 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -52,7 +52,7 @@ [[constraint]] name = "github.com/intel/govmm" - revision = "e2c716433e444017507e3587ce071868fd164380" + revision = "032705ba6aae05a9bf41e296cf89c8529cffb822" [[constraint]] name = "github.com/kata-containers/agent" diff --git a/vendor/github.com/intel/govmm/qemu/qmp.go b/vendor/github.com/intel/govmm/qemu/qmp.go index addf4b2fa..e9fa65e52 100644 --- a/vendor/github.com/intel/govmm/qemu/qmp.go +++ b/vendor/github.com/intel/govmm/qemu/qmp.go @@ -812,13 +812,15 @@ func (q *QMP) ExecuteNetdevChardevAdd(ctx context.Context, netdevType, netdevID, // Must be valid QMP identifier. func (q *QMP) ExecuteNetdevAddByFds(ctx context.Context, netdevType, netdevID string, fdNames, vhostFdNames []string) error { fdNameStr := strings.Join(fdNames, ":") - vhostFdNameStr := strings.Join(vhostFdNames, ":") args := map[string]interface{}{ - "type": netdevType, - "id": netdevID, - "fds": fdNameStr, - "vhost": "on", - "vhostfds": vhostFdNameStr, + "type": netdevType, + "id": netdevID, + "fds": fdNameStr, + } + if len(vhostFdNames) > 0 { + vhostFdNameStr := strings.Join(vhostFdNames, ":") + args["vhost"] = "on" + args["vhostfds"] = vhostFdNameStr } return q.executeCommand(ctx, "netdev_add", args, nil)