]> xenbits.xensource.com Git - libvirt.git/commitdiff
Avoid straying </cpuset>
authorGuido Günther <agx@sigxcpu.org>
Mon, 15 Oct 2012 07:58:28 +0000 (09:58 +0200)
committerOsier Yang <jyang@redhat.com>
Mon, 15 Oct 2012 09:14:25 +0000 (17:14 +0800)
by using the same condition as for the <cpuset>.

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

src/conf/domain_conf.c

index dd450b64635f1b93f36245c8acb554e73104751f..0cea8eb0e66ee3a77885f26ad43699ee68042595 100644 (file)
@@ -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)