vendor: update govmm

Shortlog:
b3e7a9e Merge pull request #91 from stefanha/virtio-fs-cache-size-mb
058cda0 qemu: use MiB instead of Gib for virtio-fs cache size

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2019-04-11 12:50:46 +01:00
parent 2f020f5a52
commit 0217077a36
3 changed files with 5 additions and 5 deletions

4
Gopkg.lock generated
View File

@ -378,11 +378,11 @@
revision = "2f1d1f20f75d5404f53b9edf6b53ed5505508675" revision = "2f1d1f20f75d5404f53b9edf6b53ed5505508675"
[[projects]] [[projects]]
digest = "1:f49a8b8840fe74235515e5bdb18b641b9d1887f3af7a38bec8f6998994e5ffca" digest = "1:2690f7d938dd074d30aa60849f26bcb9f5dd3ad88220a1f24c895c0df63fd1ae"
name = "github.com/intel/govmm" name = "github.com/intel/govmm"
packages = ["qemu"] packages = ["qemu"]
pruneopts = "NUT" pruneopts = "NUT"
revision = "35a8fd3ca9a36461b7dcf24e3b292f6e1ea4e71a" revision = "b3e7a9e78463a10f2a19e1a966c76a3afb215781"
[[projects]] [[projects]]
digest = "1:36dfd4701e98a9d8371dd3053e32d4f29e82b07bcc9e655db82138f9273bcb0f" digest = "1:36dfd4701e98a9d8371dd3053e32d4f29e82b07bcc9e655db82138f9273bcb0f"

View File

@ -48,7 +48,7 @@
[[constraint]] [[constraint]]
name = "github.com/intel/govmm" name = "github.com/intel/govmm"
revision = "35a8fd3ca9a36461b7dcf24e3b292f6e1ea4e71a" revision = "b3e7a9e78463a10f2a19e1a966c76a3afb215781"
[[constraint]] [[constraint]]
name = "github.com/kata-containers/agent" name = "github.com/kata-containers/agent"

View File

@ -748,7 +748,7 @@ type VhostUserDevice struct {
TypeDevID string //variable QEMU parameter based on value of VhostUserType TypeDevID string //variable QEMU parameter based on value of VhostUserType
Address string //used for MAC address in net case Address string //used for MAC address in net case
Tag string //virtio-fs volume id for mounting inside guest Tag string //virtio-fs volume id for mounting inside guest
CacheSize uint32 //virtio-fs DAX cache size in GiB CacheSize uint32 //virtio-fs DAX cache size in MiB
SharedVersions bool //enable virtio-fs shared version metadata SharedVersions bool //enable virtio-fs shared version metadata
VhostUserType DeviceDriver VhostUserType DeviceDriver
@ -824,7 +824,7 @@ func (vhostuserDev VhostUserDevice) QemuParams(config *Config) []string {
devParams = append(devParams, string(driver)) devParams = append(devParams, string(driver))
devParams = append(devParams, fmt.Sprintf("chardev=%s", vhostuserDev.CharDevID)) devParams = append(devParams, fmt.Sprintf("chardev=%s", vhostuserDev.CharDevID))
devParams = append(devParams, fmt.Sprintf("tag=%s", vhostuserDev.Tag)) devParams = append(devParams, fmt.Sprintf("tag=%s", vhostuserDev.Tag))
devParams = append(devParams, fmt.Sprintf("cache-size=%dG", vhostuserDev.CacheSize)) devParams = append(devParams, fmt.Sprintf("cache-size=%dM", vhostuserDev.CacheSize))
if vhostuserDev.SharedVersions { if vhostuserDev.SharedVersions {
devParams = append(devParams, "versiontable=/dev/shm/fuse_shared_versions") devParams = append(devParams, "versiontable=/dev/shm/fuse_shared_versions")
} }