External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

virCPUDefParseXML: Parse uint using virXPathUInt()

Browse Source 
There is no need to use virXPathULong() and a temporary UL
variable if we can use virXPathUInt() directly.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2020-05-20 15:36:17 +02:00
parent e2999909fc
commit 97fbb7e7e8
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/conf/cpu_conf.c
View File

@ -526,39 +526,33 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
} }
if (virXPathNode("./topology[1]", ctxt)) { if (virXPathNode("./topology[1]", ctxt)) {
unsigned long ul; if (virXPathUInt("string(./topology[1]/@sockets)", ctxt, &def->sockets) < 0) {
if (virXPathULong("string(./topology[1]/@sockets)", ctxt, &ul) < 0) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("Missing 'sockets' attribute in CPU topology")); _("Missing 'sockets' attribute in CPU topology"));
return -1; return -1;
} }
def->sockets = (unsigned int) ul;
if (virXPathNode("./topology[1]/@dies", ctxt)) { if (virXPathNode("./topology[1]/@dies", ctxt)) {
if (virXPathULong("string(./topology[1]/@dies)", ctxt, &ul) < 0) { if (virXPathUInt("string(./topology[1]/@dies)", ctxt, &def->dies) < 0) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("Malformed 'dies' attribute in CPU topology")); _("Malformed 'dies' attribute in CPU topology"));
return -1; return -1;
} }
def->dies = (unsigned int) ul;
} else { } else {
def->dies = 1; def->dies = 1;
} }
if (virXPathULong("string(./topology[1]/@cores)", ctxt, &ul) < 0) { if (virXPathUInt("string(./topology[1]/@cores)", ctxt, &def->cores) < 0) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("Missing 'cores' attribute in CPU topology")); _("Missing 'cores' attribute in CPU topology"));
return -1; return -1;
} }
def->cores = (unsigned int) ul;
if (virXPathULong("string(./topology[1]/@threads)", ctxt, &ul) < 0) { if (virXPathUInt("string(./topology[1]/@threads)", ctxt, &def->threads) < 0) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("Missing 'threads' attribute in CPU topology")); _("Missing 'threads' attribute in CPU topology"));
return -1; return -1;
} }
def->threads = (unsigned int) ul;
if (!def->sockets || !def->cores || !def->threads || !def->dies) { if (!def->sockets || !def->cores || !def->threads || !def->dies) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",