Merge branch 'devel-2.1' into devel-2.2

* devel-2.1:
  Fix --master-netdev arg name in gnt-cluster(8)
  Restore 'tablet mouse on vnc' behavior
  Document the usb_mouse hv parameter
  Revert "Add -usbdevice tablet to KVM when using vnc"

Conflicts:
	man/gnt-instance.sgml
	  - merge

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --cc lib/hypervisor/hv_kvm.py
index 3487d9d,f6520a9..c849dba
--- 1/lib/hypervisor/hv_kvm.py
--- 2/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@@ -569,13 -513,14 +571,14 @@@ class KVMHypervisor(hv_base.BaseHypervi
      if mouse_type:
        kvm_cmd.extend(['-usb'])
        kvm_cmd.extend(['-usbdevice', mouse_type])
+     elif vnc_bind_address:
+       kvm_cmd.extend(['-usbdevice', constants.HT_MOUSE_TABLET])
  
-     vnc_bind_address = hvp[constants.HV_VNC_BIND_ADDRESS]
      if vnc_bind_address:
 -      if utils.IsValidIP(vnc_bind_address):
 +      if netutils.IsValidIP4(vnc_bind_address):
          if instance.network_port > constants.VNC_BASE_PORT:
            display = instance.network_port - constants.VNC_BASE_PORT
 -          if vnc_bind_address == '0.0.0.0':
 +          if vnc_bind_address == constants.IP4_ADDRESS_ANY:
              vnc_arg = ':%d' % (display)
            else:
              vnc_arg = '%s:%d' % (vnc_bind_address, display)

diff --cc man/gnt-cluster.sgml
Simple merge

diff --cc man/gnt-instance.sgml
index 2935cf0,07bb61c..f4d2f54
--- 1/man/gnt-instance.sgml
--- 2/man/gnt-instance.sgml
+++ b/man/gnt-instance.sgml
@@@ -712,23 -694,18 +712,35 @@@
              </varlistentry>
  
              <varlistentry>
 +              <term>cpu_mask</term>
 +              <listitem>
 +                <simpara>Valid for the LXC hypervisor.</simpara>
 +
 +                <simpara>The processes belonging to the given instance are
 +                only scheduled on the specified CPUs.
 +                </simpara>
 +
 +                <simpara>
 +                The parameter format is a comma-separated list of CPU IDs or
 +                CPU ID ranges. The ranges are defined by a lower and higher
 +                boundary, separated by a dash. The boundaries are inclusive.
 +                </simpara>
 +
 +              </listitem>
 +            </varlistentry>
 +
++            <varlistentry>
+               <term>usb_mouse</term>
+               <listitem>
+                 <simpara>Valid for the KVM hypervisor.</simpara>
+ 
+                 <simpara>This option specifies the usb mouse type to be used.
+                 It can be <quote>mouse</quote> or <quote>tablet</quote>. When
+                 using VNC it's recommended to set it to <quote>tablet</quote>.
+                 </simpara>
+               </listitem>
+             </varlistentry>
+ 
 -
            </variablelist>
  
          </para>