From 199cd8f7c434fb1248ba3338bd9e402ffe7bc57b Mon Sep 17 00:00:00 2001 Message-Id: <199cd8f7c434fb1248ba3338bd9e402ffe7bc57b@dist-git> From: Jiri Denemark Date: Mon, 24 Apr 2017 15:38:41 +0200 Subject: [PATCH] conf: Rename mode parameter in virCPUDefParseXML The type of this parameter is virCPUType so calling it 'mode' is pretty strange, 'type' is a much better name. Signed-off-by: Jiri Denemark (cherry picked from commit e841a41169dd726af13f29cb57fbafe658b7011a) https://bugzilla.redhat.com/show_bug.cgi?id=1447612 Signed-off-by: Jiri Denemark --- src/conf/cpu_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index b71528ef5..9ffaf1e95 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -144,7 +144,7 @@ virCPUDefCopy(const virCPUDef *cpu) virCPUDefPtr virCPUDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, - virCPUType mode) + virCPUType type) { virCPUDefPtr def; xmlNodePtr *nodes = NULL; @@ -164,7 +164,7 @@ virCPUDefParseXML(xmlNodePtr node, if (VIR_ALLOC(def) < 0) return NULL; - if (mode == VIR_CPU_TYPE_AUTO) { + if (type == VIR_CPU_TYPE_AUTO) { if (virXPathBoolean("boolean(./arch)", ctxt)) { if (virXPathBoolean("boolean(./@match)", ctxt)) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -177,7 +177,7 @@ virCPUDefParseXML(xmlNodePtr node, def->type = VIR_CPU_TYPE_GUEST; } } else { - def->type = mode; + def->type = type; } if ((cpuMode = virXMLPropString(node, "mode"))) { -- 2.12.2