github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-13 12:59:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1800 from teawater/fix_vm

Browse Source 
Fix issue of virtio-mem
This commit is contained in:
Fupan Li
2021-05-07 13:08:12 +08:00
committed by GitHub
parent 487e165093 7f7c3fc8ec
commit 70e1d44262
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/runtime/virtcontainers/qemu.go
View File

@@ -768,8 +768,8 @@ func (q *qemu) setupVirtioMem() error {
if err != nil { if err != nil {
return err return err
} }
// 1024 is size for nvdimm // backend memory size must be multiple of 2Mib
sizeMB := int(maxMem) - int(q.config.MemorySize) sizeMB := (int(maxMem) - int(q.config.MemorySize)) >> 2 << 2
share, target, memoryBack, err := q.getMemArgs() share, target, memoryBack, err := q.getMemArgs()
if err != nil { if err != nil {
@@ -2043,8 +2043,9 @@ func (q *qemu) resizeMemory(ctx context.Context, reqMemMB uint32, memoryBlockSiz
var addMemDevice memoryDevice var addMemDevice memoryDevice
if q.config.VirtioMem && currentMemory != reqMemMB { if q.config.VirtioMem && currentMemory != reqMemMB {
q.Logger().WithField("hotplug", "memory").Debugf("resize memory from %dMB to %dMB", currentMemory, reqMemMB) q.Logger().WithField("hotplug", "memory").Debugf("resize memory from %dMB to %dMB", currentMemory, reqMemMB)
sizeByte := (reqMemMB - q.config.MemorySize) * 1024 * 1024 sizeByte := uint64(reqMemMB - q.config.MemorySize)
err := q.qmpMonitorCh.qmp.ExecQomSet(q.qmpMonitorCh.ctx, "virtiomem0", "requested-size", uint64(sizeByte)) sizeByte = sizeByte * 1024 * 1024
err := q.qmpMonitorCh.qmp.ExecQomSet(q.qmpMonitorCh.ctx, "virtiomem0", "requested-size", sizeByte)
if err != nil { if err != nil {
return 0, memoryDevice{}, err return 0, memoryDevice{}, err
} }