Commit 623fea30 authored by Guido Trotter's avatar Guido Trotter

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: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents 3b7158ef e538a046
......@@ -566,11 +566,14 @@ class KVMHypervisor(hv_base.BaseHypervisor):
kvm_cmd.extend(['-append', ' '.join(root_append)])
mouse_type = hvp[constants.HV_USB_MOUSE]
vnc_bind_address = hvp[constants.HV_VNC_BIND_ADDRESS]
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 netutils.IsValidIP4(vnc_bind_address):
if instance.network_port > constants.VNC_BASE_PORT:
......@@ -605,10 +608,6 @@ class KVMHypervisor(hv_base.BaseHypervisor):
vnc_arg = 'unix:%s/%s.vnc' % (vnc_bind_address, instance.name)
kvm_cmd.extend(['-vnc', vnc_arg])
# Also add a tablet USB device to act as a mouse
# This solves various mouse alignment issues
kvm_cmd.extend(['-usbdevice', 'tablet'])
else:
kvm_cmd.extend(['-nographic'])
......
......@@ -228,7 +228,7 @@
<sbr>
<arg>-g <replaceable>vg-name</replaceable></arg>
<sbr>
<arg>--master-netdev <replaceable>vg-name</replaceable></arg>
<arg>--master-netdev <replaceable>interface-name</replaceable></arg>
<sbr>
<arg>-m <replaceable>mac-prefix</replaceable></arg>
<sbr>
......
......@@ -729,6 +729,18 @@
</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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment