[libvirt] [PATCH v2 03/16] conf: purely a code movement
to ease the review of commits to follow.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/conf/domain_conf.c | 52 +++++++++++++++++++++++++-------------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 54925ba..3aa3476 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -11667,6 +11667,32 @@ virDomainDefParseXML(xmlDocPtr xml,
}
VIR_FREE(nodes);
+ /* analysis of cpu handling */
+ if ((node = virXPathNode("./cpu[1]", ctxt)) != NULL) {
+ xmlNodePtr oldnode = ctxt->node;
+ ctxt->node = node;
+ def->cpu = virCPUDefParseXML(node, ctxt, VIR_CPU_TYPE_GUEST);
+ ctxt->node = oldnode;
+
+ if (def->cpu == NULL)
+ goto error;
+
+ if (def->cpu->sockets &&
+ def->maxvcpus >
+ def->cpu->sockets * def->cpu->cores * def->cpu->threads) {
+ virReportError(VIR_ERR_XML_DETAIL, "%s",
+ _("Maximum CPUs greater than topology limit"));
+ goto error;
+ }
+
+ if (def->cpu->cells_cpus > def->maxvcpus) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("Number of CPUs in <numa> exceeds the"
+ " <vcpu> count"));
+ goto error;
+ }
+ }
+
/* Extract numatune if exists. */
if ((n = virXPathNodeSet("./numatune", ctxt, &nodes)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -12864,32 +12890,6 @@ virDomainDefParseXML(xmlDocPtr xml,
goto error;
}
- /* analysis of cpu handling */
- if ((node = virXPathNode("./cpu[1]", ctxt)) != NULL) {
- xmlNodePtr oldnode = ctxt->node;
- ctxt->node = node;
- def->cpu = virCPUDefParseXML(node, ctxt, VIR_CPU_TYPE_GUEST);
- ctxt->node = oldnode;
-
- if (def->cpu == NULL)
- goto error;
-
- if (def->cpu->sockets &&
- def->maxvcpus >
- def->cpu->sockets * def->cpu->cores * def->cpu->threads) {
- virReportError(VIR_ERR_XML_DETAIL, "%s",
- _("Maximum CPUs greater than topology limit"));
- goto error;
- }
-
- if (def->cpu->cells_cpus > def->maxvcpus) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Number of CPUs in <numa> exceeds the"
- " <vcpu> count"));
- goto error;
- }
- }
-
if ((node = virXPathNode("./sysinfo[1]", ctxt)) != NULL) {
xmlNodePtr oldnode = ctxt->node;
ctxt->node = node;
--
2.0.0