From 7ea9778c8a3d3a7283c8c048ed513fcc4279fe38 Mon Sep 17 00:00:00 2001
From: Taku Izumi <izumi.taku@jp.fujitsu.com>
Date: Fri, 10 Jun 2011 15:41:18 +0900
Subject: [PATCH] vcpupin: add vcpupin resetting feature to qemu driver

Pinning to all physical cpus means resetting, hence it is preferable to
delete vcpupin setting of XML.

This patch changes qemu driver to delete vcpupin setting by invoking
virDomainVcpupinDel API when pinning the specified virtual cpu to
all host physical cpus.

Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
---
 src/qemu/qemu_driver.c | 64 ++++++++++++++++++++++++++++++------------
 1 file changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 2ce4c43d88..19f22e5a51 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2952,6 +2952,7 @@ qemudDomainPinVcpuFlags(virDomainPtr dom,
     int ret = -1;
     bool isActive;
     qemuDomainObjPrivatePtr priv;
+    bool canResetting = true;
 
     virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
                   VIR_DOMAIN_AFFECT_CONFIG, -1);
@@ -3002,15 +3003,23 @@ qemudDomainPinVcpuFlags(virDomainPtr dom,
             goto cleanup;
     }
 
-    if (flags & VIR_DOMAIN_AFFECT_LIVE) {
-
-        if (nodeGetInfo(dom->conn, &nodeinfo) < 0)
-            goto cleanup;
+    if (nodeGetInfo(dom->conn, &nodeinfo) < 0)
+        goto cleanup;
+    hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo);
+    maxcpu = maplen * 8;
+    if (maxcpu > hostcpus)
+        maxcpu = hostcpus;
+    /* pinning to all physical cpus means resetting,
+     * so check if we can reset setting.
+     */
+    for (int pcpu = 0; pcpu < hostcpus; pcpu++) {
+        if ((cpumap[pcpu/8] & (1 << (pcpu % 8))) == 0) {
+            canResetting = false;
+            break;
+        }
+    }
 
-        hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo);
-        maxcpu = maplen * 8;
-        if (maxcpu > hostcpus)
-            maxcpu = hostcpus;
+    if (flags & VIR_DOMAIN_AFFECT_LIVE) {
 
         if (priv->vcpupids != NULL) {
             if (virProcessInfoSetAffinity(priv->vcpupids[vcpu],
@@ -3022,23 +3031,42 @@ qemudDomainPinVcpuFlags(virDomainPtr dom,
             goto cleanup;
         }
 
-        if (virDomainVcpupinAdd(vm->def, cpumap, maplen, vcpu) < 0) {
-            qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                            _("failed to update or add vcpupin xml of "
-                              "a running domain"));
-            goto cleanup;
+        if (canResetting) {
+            if (virDomainVcpupinDel(vm->def, vcpu) < 0) {
+                qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                                _("failed to delete vcpupin xml of "
+                                  "a running domain"));
+                goto cleanup;
+            }
+        } else {
+            if (virDomainVcpupinAdd(vm->def, cpumap, maplen, vcpu) < 0) {
+                qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                                _("failed to update or add vcpupin xml of "
+                                  "a running domain"));
+                goto cleanup;
+            }
         }
 
     }
 
     if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
 
-        if (virDomainVcpupinAdd(persistentDef, cpumap, maplen, vcpu) < 0) {
-            qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                            _("failed to update or add vcpupin xml of "
-                              "a persistent domain"));
-            goto cleanup;
+        if (canResetting) {
+            if (virDomainVcpupinDel(persistentDef, vcpu) < 0) {
+                qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                                _("failed to delete vcpupin xml of "
+                                  "a persistent domain"));
+                goto cleanup;
+            }
+        } else {
+            if (virDomainVcpupinAdd(persistentDef, cpumap, maplen, vcpu) < 0) {
+                qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                                _("failed to update or add vcpupin xml of "
+                                  "a persistent domain"));
+                goto cleanup;
+            }
         }
+
         ret = virDomainSaveConfig(driver->configDir, persistentDef);
         goto cleanup;
     }
-- 
GitLab