conf: Introduce virCPUDefCopyWithoutModel

Useful for copying a CPU definition without model related parts (i.e.,
without model name, feature list, vendor).

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index b71528ef5e338d7b8c18d096f6006231833ac2e9..c6e847aa167626a49e6d0f5a290057c20c05c574 100644 (file)
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -114,8 +114,9 @@ virCPUDefCopyModel(virCPUDefPtr dst,
     return 0;
 }
 
+
 virCPUDefPtr
-virCPUDefCopy(const virCPUDef *cpu)
+virCPUDefCopyWithoutModel(const virCPUDef *cpu)
 {
     virCPUDefPtr copy;
 
@@ -131,6 +132,18 @@ virCPUDefCopy(const virCPUDef *cpu)
     copy->threads = cpu->threads;
     copy->arch = cpu->arch;
 
+    return copy;
+}
+
+
+virCPUDefPtr
+virCPUDefCopy(const virCPUDef *cpu)
+{
+    virCPUDefPtr copy;
+
+    if (!(copy = virCPUDefCopyWithoutModel(cpu)))
+        return NULL;
+
     if (virCPUDefCopyModel(copy, cpu, false) < 0)
         goto error;
 
@@ -141,6 +154,7 @@ virCPUDefCopy(const virCPUDef *cpu)
     return NULL;
 }
 
+
 virCPUDefPtr
 virCPUDefParseXML(xmlNodePtr node,
                   xmlXPathContextPtr ctxt,

diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 705ba6d902c6684f9f6bce7d822fa86b59e24f97..2bbab9efb0cb624d3bfe96bf3420f2ba259329a9 100644 (file)
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -126,6 +126,9 @@ virCPUDefCopyModel(virCPUDefPtr dst,
 virCPUDefPtr
 virCPUDefCopy(const virCPUDef *cpu);
 
+virCPUDefPtr
+virCPUDefCopyWithoutModel(const virCPUDef *cpu);
+
 virCPUDefPtr
 virCPUDefParseXML(xmlNodePtr node,
                   xmlXPathContextPtr ctxt,

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index b6561e803ad9ae22b1fffd19106a2860c637ecae..26597bbaf540976dd4f531d74a77fe2bacefb9cf 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -66,6 +66,7 @@ virCapabilitiesSetNetPrefix;
 virCPUDefAddFeature;
 virCPUDefCopy;
 virCPUDefCopyModel;
+virCPUDefCopyWithoutModel;
 virCPUDefFormat;
 virCPUDefFormatBuf;
 virCPUDefFree;