From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 14 Jul 2015 14:23:26 +0000 (+0200)
Subject: cmdVcpuPin: Remove dead code
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=416d0e94181086e572107ab9c295b70d98f0782b;p=libvirt.git

cmdVcpuPin: Remove dead code

There's this condition:

flags & VIR_DOMAIN_AFFECT_CURRENT && virDomainIsActive(dom)

which can never be true since VIR_DOMAIN_AFFECT_CURRENT has hardcoded
value of zero. Therefore virDomainIsActive() is a dead code. However,
the condition could make sense if it is rewritten as the following:

!(flags & VIR_DOMAIN_AFFECT_CONFIG) && virDomainIsActive(dom)

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index ac04dedfcb..f7edeebc71 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -6499,7 +6499,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd)
 
         if (got_vcpu && vcpu >= ncpus) {
             if (flags & VIR_DOMAIN_AFFECT_LIVE ||
-                (flags & VIR_DOMAIN_AFFECT_CURRENT &&
+                (!(flags & VIR_DOMAIN_AFFECT_CONFIG) &&
                  virDomainIsActive(dom) == 1))
                 vshError(ctl,
                          _("vcpu %d is out of range of live cpu count %d"),