opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(host): init from guest mem obj miss size

Browse Source
This commit is contained in:
wanyaoqi
2024-02-02 16:43:14 +08:00
parent a4758fbd15
commit 7662f88edc
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/guesttasks.go
+1 -1
View File
@@ -2540,7 +2540,7 @@ func (task *SGuestHotplugCpuMemTask) onGetSlotIndex(index int) {
"size": fmt.Sprintf("%dM", task.addMemSize),
}
}
options["id"] = id
// options["id"] = id
cb := func(reason string) {
if reason == "" {
memObj := desc.NewObject(objType, id)
pkg/hostman/guestman/qemu-kvmhelper.go
+5 -1
View File
@@ -950,9 +950,13 @@ func (s *SKVMGuestInstance) initMemDescFromMemoryInfo(
return errors.Errorf("unsupported memory device type %s", memoryDevicesInfoList[i].Type)
}
memSize -= (memoryDevicesInfoList[i].Data.Size / 1024 / 1024)
memObj := desc.NewObject(s.memObjectType(), path.Base(memoryDevicesInfoList[i].Data.Memdev))
memObj.Options = map[string]string{
"size": fmt.Sprintf("%dM", memoryDevicesInfoList[i].Data.Size/1024/1024),
}
memSlots = append(memSlots, &desc.SMemSlot{
SizeMB: memoryDevicesInfoList[i].Data.Size / 1024 / 1024,
MemObj: desc.NewObject(s.memObjectType(), path.Base(memoryDevicesInfoList[i].Data.Memdev)),
MemObj: memObj,
MemDev: &desc.SMemDevice{
Type: "pc-dimm", Id: *memoryDevicesInfoList[i].Data.ID,
},