
On 2012年10月15日 16:08, Osier wrote:
----- Guido Günther<agx@sigxcpu.org> 写道:
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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cb80f09..83d7742 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13663,8 +13663,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) -- 1.7.10.4
ACK, thanks for the fix, please push.
Now pushed.