diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-17 16:49:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-17 16:49:31 +0000 |
| commit | 196da29bb222ba151a4bbdbf26ebab548824f1e1 (patch) | |
| tree | 59cc840a793e3ec35f2c6be05968b33ecd48c116 | |
| parent | e45b8bf0a4b40179319522ccd72bba69565caec6 (diff) | |
| parent | 4118c54d9c81b3bfe2b475f5124f329c985d9f5f (diff) | |
| download | nova-196da29bb222ba151a4bbdbf26ebab548824f1e1.tar.gz nova-196da29bb222ba151a4bbdbf26ebab548824f1e1.tar.xz nova-196da29bb222ba151a4bbdbf26ebab548824f1e1.zip | |
Merge "Syncs vncviewer mouse cursor when connected to Windows VMs"
| -rw-r--r-- | nova/virt/libvirt.xml.template | 3 | ||||
| -rw-r--r-- | nova/virt/libvirt/connection.py | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template index 92f04facb..282e0d5a5 100644 --- a/nova/virt/libvirt.xml.template +++ b/nova/virt/libvirt.xml.template @@ -166,6 +166,9 @@ <source path='/dev/pts/2'/> <target port='0'/> </serial> +#if $getVar('use_usb_tablet', True) + <input type='tablet' bus='usb'/> +#end if #if $getVar('vncserver_listen', False) <graphics type='vnc' port='-1' autoport='yes' keymap='${vnc_keymap}' listen='${vncserver_listen}'/> diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 7043239cb..ce86c2da6 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -100,6 +100,9 @@ libvirt_opts = [ default='', help='Override the default libvirt URI ' '(which is dependent on libvirt_type)'), + cfg.BoolOpt('use_usb_tablet', + default=True, + help='Sync virtual and real mouse cursors in Windows VMs'), cfg.StrOpt('cpuinfo_xml_template', default=utils.abspath('virt/cpuinfo.xml.template'), help='CpuInfo XML Template (Used only live migration now)'), |