External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Refactor XML parsing in virQEMUCapsLoadMachines

Browse Source 
Use the appropriate virXMLProp* helpers.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-02-27 14:45:06 +01:00
parent 603c6b840f
commit 3ff2f4af7b
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/qemu/qemu_capabilities.c
View File

@ -4182,46 +4182,38 @@ virQEMUCapsLoadMachines(virQEMUCapsAccel *caps,
caps->machineTypes = g_new0(virQEMUCapsMachineType, caps->nmachineTypes);
for (i = 0; i < n; i++) {
g_autofree char *str = NULL;
virTristateBool tmp;
if (!(caps->machineTypes[i].name = virXMLPropString(nodes[i], "name"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing machine name in QEMU capabilities cache"));
if (!(caps->machineTypes[i].name = virXMLPropStringRequired(nodes[i], "name")))
return -1;
}
caps->machineTypes[i].alias = virXMLPropString(nodes[i], "alias");
str = virXMLPropString(nodes[i], "maxCpus");
if (str &&
virStrToLong_ui(str, NULL, 10, &(caps->machineTypes[i].maxCpus)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("malformed machine cpu count in QEMU capabilities cache"));
if (virXMLPropUInt(nodes[i], "maxCpus", 10, VIR_XML_PROP_NONE,
&(caps->machineTypes[i].maxCpus)) < 0)
return -1;
}
VIR_FREE(str);
str = virXMLPropString(nodes[i], "hotplugCpus");
if (STREQ_NULLABLE(str, "yes"))
caps->machineTypes[i].hotplugCpus = true;
VIR_FREE(str);
if (virXMLPropTristateBool(nodes[i], "hotplugCpus", VIR_XML_PROP_NONE, &tmp) < 0)
return -1;
str = virXMLPropString(nodes[i], "default");
if (STREQ_NULLABLE(str, "yes"))
caps->machineTypes[i].qemuDefault = true;
VIR_FREE(str);
virTristateBoolToBool(tmp, &caps->machineTypes[i].hotplugCpus);
str = virXMLPropString(nodes[i], "numaMemSupported");
if (STREQ_NULLABLE(str, "yes"))
caps->machineTypes[i].numaMemSupported = true;
VIR_FREE(str);
if (virXMLPropTristateBool(nodes[i], "default", VIR_XML_PROP_NONE, &tmp) < 0)
return -1;
virTristateBoolToBool(tmp, &caps->machineTypes[i].qemuDefault);
if (virXMLPropTristateBool(nodes[i], "numaMemSupported", VIR_XML_PROP_NONE, &tmp) < 0)
return -1;
virTristateBoolToBool(tmp, &caps->machineTypes[i].numaMemSupported);
caps->machineTypes[i].defaultCPU = virXMLPropString(nodes[i], "defaultCPU");
caps->machineTypes[i].defaultRAMid = virXMLPropString(nodes[i], "defaultRAMid");
str = virXMLPropString(nodes[i], "deprecated");
if (STREQ_NULLABLE(str, "yes"))
caps->machineTypes[i].deprecated = true;
VIR_FREE(str);
if (virXMLPropTristateBool(nodes[i], "deprecated", VIR_XML_PROP_NONE, &tmp) < 0)
return -1;
virTristateBoolToBool(tmp, &caps->machineTypes[i].deprecated);
}
return 0;