shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 09:17:52 +03:00
Code Releases Activity

cpu_x86: Simplify x86ParseCPUID

Browse Source 
... by using virXMLProp*() helpers. These only require a xmlNodePtr and
do not need a xmlXPathContextPtr. Reflect that in the function signature.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-10-12 17:39:14 +02:00
parent ebd796b811
commit 3092ee9e9e
1 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/cpu/cpu_x86.c
View File

@ -1021,37 +1021,26 @@ x86FeatureNames(virCPUx86Map *map,
static int static int
x86ParseCPUID(xmlXPathContextPtr ctxt, x86ParseCPUID(xmlNodePtr node,
virCPUx86DataItem *item) virCPUx86DataItem *item)
{ {
virCPUx86CPUID *cpuid; virCPUx86CPUID cpuid = { 0 };
unsigned long eax_in, ecx_in;
unsigned long eax, ebx, ecx, edx;
int ret_eax_in, ret_ecx_in, ret_eax, ret_ebx, ret_ecx, ret_edx;
memset(item, 0, sizeof(*item)); if (virXMLPropUInt(node, "eax_in", 0, VIR_XML_PROP_REQUIRED, &cpuid.eax_in) < 0)
return -1;
eax_in = ecx_in = 0; if (virXMLPropUInt(node, "ecx_in", 0, VIR_XML_PROP_NONE, &cpuid.ecx_in) < 0)
eax = ebx = ecx = edx = 0; return -1;
ret_eax_in = virXPathULongHex("string(@eax_in)", ctxt, &eax_in); if (virXMLPropUInt(node, "eax", 0, VIR_XML_PROP_NONE, &cpuid.eax) < 0)
ret_ecx_in = virXPathULongHex("string(@ecx_in)", ctxt, &ecx_in); return -1;
ret_eax = virXPathULongHex("string(@eax)", ctxt, &eax); if (virXMLPropUInt(node, "ebx", 0, VIR_XML_PROP_NONE, &cpuid.ebx) < 0)
ret_ebx = virXPathULongHex("string(@ebx)", ctxt, &ebx); return -1;
ret_ecx = virXPathULongHex("string(@ecx)", ctxt, &ecx); if (virXMLPropUInt(node, "ecx", 0, VIR_XML_PROP_NONE, &cpuid.ecx) < 0)
ret_edx = virXPathULongHex("string(@edx)", ctxt, &edx); return -1;
if (virXMLPropUInt(node, "edx", 0, VIR_XML_PROP_NONE, &cpuid.edx) < 0)
if (ret_eax_in < 0 || ret_ecx_in == -2 ||
ret_eax == -2 || ret_ebx == -2 || ret_ecx == -2 || ret_edx == -2)
return -1; return -1;
item->type = VIR_CPU_X86_DATA_CPUID; item->type = VIR_CPU_X86_DATA_CPUID;
cpuid = &item->data.cpuid; item->data.cpuid = cpuid;
cpuid->eax_in = eax_in;
cpuid->ecx_in = ecx_in;
cpuid->eax = eax;
cpuid->ebx = ebx;
cpuid->ecx = ecx;
cpuid->edx = edx;
return 0; return 0;
} }
@ -1122,7 +1111,7 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
ctxt->node = nodes[i]; ctxt->node = nodes[i];
if (virXMLNodeNameEqual(nodes[i], "cpuid")) { if (virXMLNodeNameEqual(nodes[i], "cpuid")) {
if (x86ParseCPUID(ctxt, &item) < 0) { if (x86ParseCPUID(ctxt->node, &item) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid cpuid[%zu] in %s feature"), _("Invalid cpuid[%zu] in %s feature"),
i, feature->name); i, feature->name);
@ -1812,7 +1801,7 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
ctxt->node = nodes[i]; ctxt->node = nodes[i];
if (virXMLNodeNameEqual(nodes[i], "cpuid")) { if (virXMLNodeNameEqual(nodes[i], "cpuid")) {
if (x86ParseCPUID(ctxt, &item) < 0) { if (x86ParseCPUID(ctxt->node, &item) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("failed to parse cpuid[%zu]"), i); _("failed to parse cpuid[%zu]"), i);
return NULL; return NULL;