Description of problem:


Version-Release number of selected component (if applicable):
libvirt-1.2.7-1.el7.x86_64
qemu-kvm-rhev-2.1.0-1.el7.x86_64
kernel-3.10.0-142.el7.x86_64


How reproducible:
100%

Steps to Reproduce:

[root@rhel7 ~]# virsh -k -1
error: option --k requires a positive numeric argument

[root@rhel7 ~]# virsh -K -2
error: option --K requires a positive numeric argument

[root@rhel7 ~]# virsh --keepalive-interval=-1
error: option ---keepalive-interval requires a positive numeric argument

[root@rhel7 ~]# virsh --keepalive-count=-2
error: option ---keepalive-count requires a positive numeric argument

Actual results:
1. for -k option, error info is:
error: option --k requires a positive numeric argument

2. for -K option, error info is:
error: option --K requires a positive numeric argument

3. for --keepalive-interval option, error info is:
error: option ---keepalive-count requires a positive numeric argument

4. for --keepalive-count option, error info is:
error: option ---keepalive-count requires a positive numeric argument

Expected results:
1. for -k option, error info should be:   (not --k option in error info)
error: option -k requires a positive numeric argument

2. for -K option, error info should be:   (not --K option in error info)
error: option -K requires a positive numeric argument

3. for --keepalive-interval option, error info should be:   (not
---keepalive-interval option in error info)
error: option --keepalive-interval requires a positive numeric argument

4. for --keepalive-count option, error info should be:   (not
---keepalive-count option in error info)
error: option --keepalive-count requires a positive numeric argument


Additional info:
 From man page, zero are acceptable for options -k and -K,

    -k, --keepalive-interval INTERVAL
            Set an INTERVAL (in seconds) for sending keepalive messages
to check whether connection to the server is still alive. Setting the
interval to 0 disables client
            keepalive mechanism.

    -K, --keepalive-count COUNT
            Set a number of times keepalive message can be sent without
getting an answer from the server without marking the connection dead.
There is no effect to this
            setting in case the INTERVAL is set to 0.

It is suggested that these error info should be just like:
1. error: option -k requires a positive numeric or zero argument
2. error: option -K requires a positive numeric or zero argument
3. error: option --keepalive-interval requires a positive numeric
argument or zero argument
4. error: option --keepalive-count requires a positive numeric argument
or zero argument