conf: Don't copy def->cpumask into cpu pinning info

This step can be omitted, so that drivers can decide what to do when the
user requests to use default vcpu pinning.

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e4eba1a957eb1eb997468ed779765a1b0c6dd8e6..ebcf5128250fb9db9b9fc8b3905f634d15527aba 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -15173,34 +15173,6 @@ virDomainDefParseXML(xmlDocPtr xml,
     }
     VIR_FREE(nodes);
 
-    /* Initialize the pinning policy for vcpus which doesn't has
-     * the policy specified explicitly as def->cpuset.
-     */
-    if (def->cpumask) {
-        if (VIR_REALLOC_N(def->cputune.vcpupin, virDomainDefGetVcpus(def)) < 0)
-            goto error;
-
-        for (i = 0; i < virDomainDefGetVcpus(def); i++) {
-            if (virDomainPinIsDuplicate(def->cputune.vcpupin,
-                                        def->cputune.nvcpupin,
-                                        i))
-                continue;
-
-            virDomainPinDefPtr vcpupin = NULL;
-
-            if (VIR_ALLOC(vcpupin) < 0)
-                goto error;
-
-            if (!(vcpupin->cpumask = virBitmapNew(VIR_DOMAIN_CPUMASK_LEN))) {
-                VIR_FREE(vcpupin);
-                goto error;
-            }
-            virBitmapCopy(vcpupin->cpumask, def->cpumask);
-            vcpupin->id = i;
-            def->cputune.vcpupin[def->cputune.nvcpupin++] = vcpupin;
-        }
-    }
-
     if ((n = virXPathNodeSet("./cputune/emulatorpin", ctxt, &nodes)) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("cannot extract emulatorpin nodes"));
@@ -21875,10 +21847,6 @@ virDomainDefFormatInternal(virDomainDefPtr def,
 
     for (i = 0; i < def->cputune.nvcpupin; i++) {
         char *cpumask;
-        /* Ignore the vcpupin which inherit from "cpuset of "<vcpu>." */
-        if (virBitmapEqual(def->cpumask, def->cputune.vcpupin[i]->cpumask))
-            continue;
-
         virBufferAsprintf(&childrenBuf, "<vcpupin vcpu='%u' ",
                           def->cputune.vcpupin[i]->id);
 

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 1133c8b4ec4d416fd640801bd789ac1d88407f16..67b230ac796be40c69567814aa5113c6ba1e50da 100644 (file)
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -829,9 +829,18 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm)
 
     libxl_bitmap_init(&map);
 
-    for (i = 0; i < vm->def->cputune.nvcpupin; ++i) {
-        pin = vm->def->cputune.vcpupin[i];
-        cpumask = pin->cpumask;
+    for (i = 0; i < virDomainDefGetVcpus(vm->def); ++i) {
+        pin = virDomainPinFind(vm->def->cputune.vcpupin,
+                               vm->def->cputune.nvcpupin,
+                               i);
+
+        if (pin && pin->cpumask)
+            cpumask = pin->cpumask;
+        else
+            cpumask = vm->def->cpumask;
+
+        if (!cpumask)
+            continue;
 
         if (virBitmapToData(cpumask, &map.map, (int *)&map.size) < 0)
             goto cleanup;

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 2a6c2deeda9f73fef6e77e7f4705ff4665d58659..8965abdcf0b4ad9c6ba672bb69e4bd93f5c8718d 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -2472,6 +2472,8 @@ libxlDomainGetVcpuPinInfo(virDomainPtr dom, int ncpumaps,
 
         if (pininfo && pininfo->cpumask)
             bitmap = pininfo->cpumask;
+        else if (targetDef->cpumask)
+            bitmap = targetDef->cpumask;
         else
             bitmap = allcpumap;
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d6eb8f7fcc87dfd40974e3c3a2ac64a3b6da5fec..d15b364c805db10905b70b04ac39a71964bca427 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4682,33 +4682,6 @@ qemuDomainAddCgroupForThread(virCgroupPtr cgroup,
     return NULL;
 }
 
-static int
-qemuDomainHotplugAddPin(virBitmapPtr cpumask,
-                        int idx,
-                        virDomainPinDefPtr **pindef_list,
-                        size_t *npin)
-{
-    int ret = -1;
-    virDomainPinDefPtr pindef = NULL;
-
-    if (VIR_ALLOC(pindef) < 0)
-        goto cleanup;
-
-    if (!(pindef->cpumask = virBitmapNewCopy(cpumask))) {
-        VIR_FREE(pindef);
-        goto cleanup;
-    }
-    pindef->id = idx;
-    if (VIR_APPEND_ELEMENT_COPY(*pindef_list, *npin, pindef) < 0) {
-        virBitmapFree(pindef->cpumask);
-        VIR_FREE(pindef);
-        goto cleanup;
-    }
-    ret = 0;
-
- cleanup:
-    return ret;
-}
 
 static int
 qemuDomainHotplugPinThread(virBitmapPtr cpumask,
@@ -4825,11 +4798,6 @@ qemuDomainHotplugAddVcpu(virQEMUDriverPtr driver,
 
     /* Inherit def->cpuset */
     if (vm->def->cpumask) {
-        if (qemuDomainHotplugAddPin(vm->def->cpumask, vcpu,
-                                    &vm->def->cputune.vcpupin,
-                                    &vm->def->cputune.nvcpupin) < 0)
-            goto cleanup;
-
         if (qemuDomainHotplugPinThread(vm->def->cpumask, vcpu, vcpupid,
                                        cgroup_vcpu) < 0) {
             goto cleanup;
@@ -5357,6 +5325,8 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
         else if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO &&
                  priv->autoCpuset)
             bitmap = priv->autoCpuset;
+        else if (def->cpumask)
+            bitmap = def->cpumask;
         else
             bitmap = allcpumap;
 

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index fded697bcd97845d74650e086cfbf88d55834764..c78e72109deeb3309878e697181baa5e5bc18637 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2207,7 +2207,8 @@ qemuProcessSetVcpuAffinities(virDomainObjPtr vm)
          * VM default affinity, we must reject it
          */
         for (n = 0; n < def->cputune.nvcpupin; n++) {
-            if (!virBitmapEqual(def->cpumask,
+            if (def->cputune.vcpupin[n]->cpumask &&
+                !virBitmapEqual(def->cpumask,
                                 def->cputune.vcpupin[n]->cpumask)) {
                 virReportError(VIR_ERR_OPERATION_INVALID,
                                "%s", _("cpu affinity is not supported"));
@@ -2218,16 +2219,19 @@ qemuProcessSetVcpuAffinities(virDomainObjPtr vm)
     }
 
     for (n = 0; n < virDomainDefGetVcpus(def); n++) {
+        virBitmapPtr bitmap;
         /* set affinity only for existing vcpus */
         if (!(pininfo = virDomainPinFind(def->cputune.vcpupin,
                                          def->cputune.nvcpupin,
                                          n)))
             continue;
 
-        if (virProcessSetAffinity(qemuDomainGetVcpuPid(vm, n),
-                                  pininfo->cpumask) < 0) {
+        if (!(bitmap = pininfo->cpumask) &&
+            !(bitmap = def->cpumask))
+            continue;
+
+        if (virProcessSetAffinity(qemuDomainGetVcpuPid(vm, n), bitmap) < 0)
             goto cleanup;
-        }
     }
 
     ret = 0;

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index fde5e2d6534a316ed7541220cb3970a211a34008..1a7f43b7bb755197278a4fd5653042fd46d615ae 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2575,6 +2575,8 @@ testDomainGetVcpuPinInfo(virDomainPtr dom,
 
         if (pininfo && pininfo->cpumask)
             bitmap = pininfo->cpumask;
+        else if (def->cpumask)
+            bitmap = def->cpumask;
         else
             bitmap = allcpumap;
 

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index d61097942270a1ed5d901d2d9efdacaf0e8d8fe2..7cc24d31802309967da7c3d2d4e45c42dc84d421 100644 (file)
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -1959,8 +1959,8 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def)
 
     if (def->cputune.vcpupin) {
         for (i = 0; i < def->cputune.nvcpupin; i++) {
-            if (!virBitmapEqual(def->cpumask,
-                                def->cputune.vcpupin[i]->cpumask)) {
+            if (def->cputune.vcpupin[i]->cpumask &&
+                !virBitmapEqual(def->cpumask, def->cputune.vcpupin[i]->cpumask)) {
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                "%s", _("vcpupin cpumask differs from default cpumask"));
                 return -1;