From: Hu Tao <hutao@cn.fujitsu.com>
Date: Tue, 21 Aug 2012 09:18:29 +0000 (+0800)
Subject: updates of some vcpupin related functions
X-Git-Tag: v0.10.0-rc1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5dd8b808c2980f85c54fbca7cf87978ab7fe759;p=thirdparty%2Flibvirt.git

updates of some vcpupin related functions

1. add a new function virDomainVcpuPinDefCopy
2. make virDomainVcpuPinDefFree non-static
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 38522fd64c..5533355a87 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1511,7 +1511,39 @@ virDomainClockDefClear(virDomainClockDefPtr def)
     VIR_FREE(def->timers);
 }
 
-static void
+virDomainVcpuPinDefPtr *
+virDomainVcpuPinDefCopy(virDomainVcpuPinDefPtr *src, int nvcpupin)
+{
+    int i = 0;
+    virDomainVcpuPinDefPtr *ret;
+
+    if (VIR_ALLOC_N(ret, nvcpupin) < 0) {
+        goto no_memory;
+    }
+
+    for (i = 0; i < nvcpupin; i++) {
+        if (VIR_ALLOC(ret[i]) < 0)
+            goto no_memory;
+        if (VIR_ALLOC_N(ret[i]->cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0)
+            goto no_memory;
+        ret[i]->vcpuid = src[i]->vcpuid;
+        memcpy(ret[i]->cpumask, src[i]->cpumask, VIR_DOMAIN_CPUMASK_LEN);
+    }
+
+    return ret;
+
+no_memory:
+    while (i >= 0) {
+        VIR_FREE(ret[i]->cpumask);
+        VIR_FREE(ret[i]);
+    }
+    VIR_FREE(ret);
+    virReportOOMError();
+
+    return NULL;
+}
+
+void
 virDomainVcpuPinDefFree(virDomainVcpuPinDefPtr *def,
                         int nvcpupin)
 {
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index bf2585a69e..9002222369 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1536,6 +1536,11 @@ struct _virDomainVcpuPinDef {
     char *cpumask;
 };
 
+void virDomainVcpuPinDefFree(virDomainVcpuPinDefPtr *def, int nvcpupin);
+
+virDomainVcpuPinDefPtr *virDomainVcpuPinDefCopy(virDomainVcpuPinDefPtr *src,
+                                                int nvcpupin);
+
 int virDomainVcpuPinIsDuplicate(virDomainVcpuPinDefPtr *def,
                                 int nvcpupin,
                                 int vcpu);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index b48fff0be0..9d0e753190 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -506,6 +506,8 @@ virDomainTimerTickpolicyTypeToString;
 virDomainTimerTrackTypeFromString;
 virDomainTimerTrackTypeToString;
 virDomainVcpuPinAdd;
+virDomainVcpuPinDefCopy;
+virDomainVcpuPinDefFree;
 virDomainVcpuPinDel;
 virDomainVcpuPinFindByVcpu;
 virDomainVcpuPinIsDuplicate;