[libvirt] [PATCH v2 08/30] cpu_x86: Separate signature parsing from x86ModelParse
The code is separated into a new x86ModelParseSignature function.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
---
Notes:
Version 2:
- move rc variable inside if statement where it was originally
src/cpu/cpu_x86.c | 58 ++++++++++++++++++++++++++++-------------------
1 file changed, 35 insertions(+), 23 deletions(-)
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 8a0ff50afe..b254c58b08 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -1186,6 +1186,39 @@ x86ModelParseAncestor(virCPUx86ModelPtr model,
}
+static int
+x86ModelParseSignature(virCPUx86ModelPtr model,
+ xmlXPathContextPtr ctxt)
+{
+
+ if (virXPathBoolean("boolean(./signature)", ctxt)) {
+ unsigned int sigFamily = 0;
+ unsigned int sigModel = 0;
+ int rc;
+
+ rc = virXPathUInt("string(./signature/@family)", ctxt,
&sigFamily);
+ if (rc < 0 || sigFamily == 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Invalid CPU signature family in model %s"),
+ model->name);
+ return -1;
+ }
+
+ rc = virXPathUInt("string(./signature/@model)", ctxt, &sigModel);
+ if (rc < 0 || sigModel == 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Invalid CPU signature model in model %s"),
+ model->name);
+ return -1;
+ }
+
+ model->signature = x86MakeSignature(sigFamily, sigModel, 0);
+ }
+
+ return 0;
+}
+
+
static int
x86ModelParse(xmlXPathContextPtr ctxt,
const char *name,
@@ -1208,29 +1241,8 @@ x86ModelParse(xmlXPathContextPtr ctxt,
if (x86ModelParseAncestor(model, ctxt, map) < 0)
goto cleanup;
- if (virXPathBoolean("boolean(./signature)", ctxt)) {
- unsigned int sigFamily = 0;
- unsigned int sigModel = 0;
- int rc;
-
- rc = virXPathUInt("string(./signature/@family)", ctxt,
&sigFamily);
- if (rc < 0 || sigFamily == 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Invalid CPU signature family in model %s"),
- model->name);
- goto cleanup;
- }
-
- rc = virXPathUInt("string(./signature/@model)", ctxt, &sigModel);
- if (rc < 0 || sigModel == 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Invalid CPU signature model in model %s"),
- model->name);
- goto cleanup;
- }
-
- model->signature = x86MakeSignature(sigFamily, sigModel, 0);
- }
+ if (x86ModelParseSignature(model, ctxt) < 0)
+ goto cleanup;
if (virXPathBoolean("boolean(./vendor)", ctxt)) {
vendor = virXPathString("string(./vendor/@name)", ctxt);
--
2.21.0