opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 22:32:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(host): add query id on detect qemu machine info (#24046)

Browse Source
This commit is contained in:
wanyaoqi
2026-01-09 08:24:42 +08:00
committed by GitHub
parent 3eba59982c
commit 399bfcb2e2
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/hostinfo/hostinfo.go
+22 -18
View File
@@ -1082,32 +1082,36 @@ func (h *SHostInfo) detectQemuCapabilities(version string) error {
}
qmpCmds := fmt.Sprintf(`echo "{'execute': 'qmp_capabilities'}
{'execute': 'query-machines'}
{'execute': 'query-machines','id':'query_machines'}
{'execute': 'quit'}" | %s -qmp stdio -vnc none -machine none -display none`, qemutils.GetQemu(version))
log.Debugf("qemu caps cmdline %v", qmpCmds)
out, err := procutils.NewRemoteCommandAsFarAsPossible("sh", "-c", qmpCmds).Output()
if err != nil {
log.Errorf("failed start qemu caps cmdline: %s", qmpCmds)
}
segs := bytes.Split(out, []byte{'\n'})
if len(segs) < 6 {
return errors.Errorf("unexpect qmp res %s", out)
for _, seg := range segs {
res, err := jsonutils.Parse(bytes.TrimSpace(seg))
if err != nil {
return errors.Errorf("Unmarshal %s error: %s", seg, err)
}
id, _ := res.GetString("id")
if id == "query_machines" {
var machineInfoList = make([]monitor.MachineInfo, 0)
err = res.Unmarshal(&machineInfoList, "return")
if err != nil {
return errors.Wrapf(err, "failed unmarshal machineinfo return %s", res.PrettyString())
}
h.qemuMachineInfoList = machineInfoList
qemuCaps := &QemuCaps{
QemuVersion: version,
MachineInfoList: machineInfoList,
}
return fileutils2.FilePutContents(capsPath, jsonutils.Marshal(qemuCaps).String(), false)
}
}
res, err := jsonutils.Parse(bytes.TrimSpace(segs[2]))
if err != nil {
return errors.Errorf("Unmarshal %s error: %s", segs[2], err)
}
var machineInfoList = make([]monitor.MachineInfo, 0)
err = res.Unmarshal(&machineInfoList, "return")
if err != nil {
return errors.Wrapf(err, "failed unmarshal machineinfo return %s", res.PrettyString())
}
h.qemuMachineInfoList = machineInfoList
qemuCaps := &QemuCaps{
QemuVersion: version,
MachineInfoList: machineInfoList,
}
return fileutils2.FilePutContents(capsPath, jsonutils.Marshal(qemuCaps).String(), false)
return errors.Errorf("failed parse qemu machine info: %s", out)
}
func (h *SHostInfo) GetQemuMachineInfoList() []monitor.MachineInfo {