From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 30 Oct 2013 12:58:09 +0000 (+0100)
Subject: virsh-domain: Mark --live and --config mutually exclusive in vcpucount
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bf45db6041c207e78e6a3185ceaf278b09e21561;p=libvirt.git

virsh-domain: Mark --live and --config mutually exclusive in vcpucount

The 'vcpucount' command is a getter command for the vCPUu count. When
one or more of the filtering flags are specified the command returns the
value only for the selected combination. In this case the --live and
--config combination isn't valid. This however didn't cause errors as
the combination of flags was rejected by the libvirt API but then the
fallback code kicked in and requested the count in a way where the clash
of the flags didn't matter.

Mark the flag combination mutually exclusive so that users aren't
confused.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1024245
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 59e3d8df3a..60abd3da9d 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -5331,6 +5331,7 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd)
     if (!maximum && !active && current)
         current = false;
 
+    VSH_EXCLUSIVE_OPTIONS_VAR(live, config)
     VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
     VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
     VSH_EXCLUSIVE_OPTIONS_VAR(active, maximum);