From: Guido Günther <agx@sigxcpu.org>
Date: Mon, 15 Oct 2012 07:58:28 +0000 (+0200)
Subject: Avoid straying </cpuset>
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=dc9d7a171c215efda1da17fca26a860030107fed;p=libvirt.git

Avoid straying </cpuset>

by using the same condition as for the <cpuset>.

Fixes "make check" found by
    http://honk.sigxcpu.org:8001/job/libvirt-check/160/
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index dd450b6463..0cea8eb0e6 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13687,8 +13687,8 @@ virDomainDefFormatInternal(virDomainDefPtr def,
         virBufferAsprintf(buf, "cpuset='%s'/>\n", cpumask);
         VIR_FREE(cpumask);
     }
-
-    if (def->cputune.shares || def->cputune.vcpupin ||
+    if (def->cputune.shares ||
+        (def->cputune.vcpupin && !virDomainIsAllVcpupinInherited(def)) ||
         def->cputune.period || def->cputune.quota ||
         def->cputune.emulatorpin ||
         def->cputune.emulator_period || def->cputune.emulator_quota)