diff --git a/Gopkg.lock b/Gopkg.lock index 236c0c7219..25cf65ea15 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -391,11 +391,11 @@ revision = "2f1d1f20f75d5404f53b9edf6b53ed5505508675" [[projects]] - digest = "1:47de8e5ccb45c6f00a2b4a62327601f7884830016267b470b42688f9c82d4b7d" + digest = "1:1a7407072d9447e0e39148aa462f0be26261e29ff14679ccee4fbed106c1a766" name = "github.com/intel/govmm" packages = ["qemu"] pruneopts = "NUT" - revision = "e6644f4a25ae570a6d1c4c6efe6c3be7526bbaa3" + revision = "ee460e3008d48043f8561628d1d5308357d72cf6" [[projects]] digest = "1:22e399f891fccaac4700943a9465f2623bb361653d5e0d4a9974573cd5e69070" diff --git a/Gopkg.toml b/Gopkg.toml index 1cb80b5992..83366412eb 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -48,7 +48,7 @@ [[constraint]] name = "github.com/intel/govmm" - revision = "e6644f4a25ae570a6d1c4c6efe6c3be7526bbaa3" + revision = "ee460e3008d48043f8561628d1d5308357d72cf6" [[constraint]] name = "github.com/kata-containers/agent" diff --git a/vendor/github.com/intel/govmm/qemu/qemu.go b/vendor/github.com/intel/govmm/qemu/qemu.go index 4cb18d10ad..daac268bdb 100644 --- a/vendor/github.com/intel/govmm/qemu/qemu.go +++ b/vendor/github.com/intel/govmm/qemu/qemu.go @@ -1761,7 +1761,9 @@ func (config *Config) appendMemoryKnobs() { if config.Memory.Size == "" { return } - + if !isDimmSupported() { + return + } var objMemParam, numaMemParam string dimmName := "dimm1" if config.Knobs.HugePages { diff --git a/vendor/github.com/intel/govmm/qemu/qemu_arch_base.go b/vendor/github.com/intel/govmm/qemu/qemu_arch_base.go index a7bbed558e..f295099cee 100644 --- a/vendor/github.com/intel/govmm/qemu/qemu_arch_base.go +++ b/vendor/github.com/intel/govmm/qemu/qemu_arch_base.go @@ -105,3 +105,7 @@ func (n NetDeviceType) QemuDeviceParam() DeviceDriver { } } + +func isDimmSupported() bool { + return true +} diff --git a/vendor/github.com/intel/govmm/qemu/qemus390x.go b/vendor/github.com/intel/govmm/qemu/qemus390x.go index c52edd67ce..0aeffceeb5 100644 --- a/vendor/github.com/intel/govmm/qemu/qemus390x.go +++ b/vendor/github.com/intel/govmm/qemu/qemus390x.go @@ -134,3 +134,7 @@ func (n NetDeviceType) QemuNetdevParam() string { } } + +func isDimmSupported() bool { + return false +}