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@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index b4965f3ee033d9670b1e88ff3e5accf2b52bfa61..7823c7cd3d54b7c623b109d24e71a64149ef930f 100644 (file)
--- 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 d11d2641fcf29065a1c57917aef99e25607d4642..c4897a33f5083aed71e4be2495c2db57a1959df9 100644 (file)
--- 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 c47dd1cf93d98c2045ebbccab7fb96d03d63c03b..4b2a0ef1f93f8a05aa11e6399d75223670176171 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -1780,14 +1780,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);