[libvirt PATCH v2 04/20] cpu: Change virCPUArchDataParse to take xmlNodePtr
The function does not need a full xmlXPathContextPtr any longer and a
later patch will require a call to this function with only a xmlNodePtr
available.
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/cpu/cpu.c | 2 +-
src/cpu/cpu.h | 2 +-
src/cpu/cpu_x86.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index b4965f3ee0..7823c7cd3d 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -832,7 +832,7 @@ virCPUDataParse(const char *xmlStr)
return NULL;
}
- data = driver->dataParse(ctxt);
+ data = driver->dataParse(ctxt->node);
return data;
}
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index d11d2641fc..c4897a33f5 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -98,7 +98,7 @@ typedef char *
(*virCPUArchDataFormat)(const virCPUData *data);
typedef virCPUData *
-(*virCPUArchDataParse)(xmlXPathContextPtr ctxt);
+(*virCPUArchDataParse)(xmlNodePtr node);
typedef int
(*virCPUArchGetModels)(char ***models);
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 29b4df1f79..a08ac225ef 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -1782,14 +1782,14 @@ virCPUx86DataFormat(const virCPUData *data)
static virCPUData *
-virCPUx86DataParse(xmlXPathContextPtr ctxt)
+virCPUx86DataParse(xmlNodePtr node)
{
g_autoptr(virCPUData) cpuData = NULL;
if (!(cpuData = virCPUDataNew(VIR_ARCH_X86_64)))
return NULL;
- if (x86ParseDataItemList(&cpuData->data.x86, ctxt->node) < 0)
+ if (x86ParseDataItemList(&cpuData->data.x86, node) < 0)
return NULL;
return g_steal_pointer(&cpuData);
--
2.31.1