Configure a USB tablet for fullyvirt guests

berrange · berrange · commit 93026bc1e4a6 · 2007-08-10T09:26:52.000-04:00
diff --git a/tests/boot-fullyvirt-disk-block.xml b/tests/boot-fullyvirt-disk-block.xml
@@ -29,6 +29,7 @@
     </disk>
 
 
+    <input type='tablet' bus='usb'/>
     <graphics type='sdl'/>
   </devices>
 </domain>
diff --git a/tests/boot-fullyvirt-disk-file.xml b/tests/boot-fullyvirt-disk-file.xml
@@ -29,6 +29,7 @@
     </disk>
 
 
+    <input type='tablet' bus='usb'/>
     <graphics type='sdl'/>
   </devices>
 </domain>
diff --git a/tests/boot-paravirt-disk-block.xml b/tests/boot-paravirt-disk-block.xml
@@ -15,6 +15,7 @@
     </disk>
 
 
+    <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' keymap='ja' />
   </devices>
 </domain>
diff --git a/tests/boot-paravirt-disk-drv-file.xml b/tests/boot-paravirt-disk-drv-file.xml
@@ -16,6 +16,7 @@
     </disk>
 
 
+    <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' keymap='ja' />
   </devices>
 </domain>
diff --git a/tests/boot-paravirt-disk-drv-phy.xml b/tests/boot-paravirt-disk-drv-phy.xml
@@ -16,6 +16,7 @@
     </disk>
 
 
+    <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' keymap='ja' />
   </devices>
 </domain>
diff --git a/tests/boot-paravirt-disk-drv-tap-qcow.xml b/tests/boot-paravirt-disk-drv-tap-qcow.xml
@@ -16,6 +16,7 @@
     </disk>
 
 
+    <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' keymap='ja' />
   </devices>
 </domain>
diff --git a/tests/boot-paravirt-disk-drv-tap.xml b/tests/boot-paravirt-disk-drv-tap.xml
@@ -16,6 +16,7 @@
     </disk>
 
 
+    <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' keymap='ja' />
   </devices>
 </domain>
diff --git a/tests/boot-paravirt-disk-file.xml b/tests/boot-paravirt-disk-file.xml
@@ -15,6 +15,7 @@
     </disk>
 
 
+    <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' keymap='ja' />
   </devices>
 </domain>
diff --git a/tests/boot-paravirt-many-disks.xml b/tests/boot-paravirt-many-disks.xml
@@ -24,6 +24,7 @@
     </disk>
 
 
+    <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' keymap='ja' />
   </devices>
 </domain>
diff --git a/tests/install-fullyvirt-disk-block.xml b/tests/install-fullyvirt-disk-block.xml
@@ -29,6 +29,7 @@
     </disk>
 
 
+    <input type='tablet' bus='usb'/>
     <graphics type='sdl'/>
   </devices>
 </domain>
diff --git a/tests/install-fullyvirt-disk-file.xml b/tests/install-fullyvirt-disk-file.xml
@@ -29,6 +29,7 @@
     </disk>
 
 
+    <input type='tablet' bus='usb'/>
     <graphics type='sdl'/>
   </devices>
 </domain>
diff --git a/tests/install-paravirt-disk-block.xml b/tests/install-paravirt-disk-block.xml
@@ -20,6 +20,7 @@
     </disk>
 
 
+    <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' keymap='ja' />
   </devices>
 </domain>
diff --git a/tests/install-paravirt-disk-drv-file.xml b/tests/install-paravirt-disk-drv-file.xml
@@ -21,6 +21,7 @@
     </disk>
 
 
+    <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' keymap='ja' />
   </devices>
 </domain>
diff --git a/tests/install-paravirt-disk-drv-phy.xml b/tests/install-paravirt-disk-drv-phy.xml
@@ -21,6 +21,7 @@
     </disk>
 
 
+    <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' keymap='ja' />
   </devices>
 </domain>
diff --git a/tests/install-paravirt-disk-drv-tap-qcow.xml b/tests/install-paravirt-disk-drv-tap-qcow.xml
@@ -21,6 +21,7 @@
     </disk>
 
 
+    <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' keymap='ja' />
   </devices>
 </domain>
diff --git a/tests/install-paravirt-disk-drv-tap.xml b/tests/install-paravirt-disk-drv-tap.xml
@@ -21,6 +21,7 @@
     </disk>
 
 
+    <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' keymap='ja' />
   </devices>
 </domain>
diff --git a/tests/install-paravirt-disk-file.xml b/tests/install-paravirt-disk-file.xml
@@ -20,6 +20,7 @@
     </disk>
 
 
+    <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' keymap='ja' />
   </devices>
 </domain>
diff --git a/tests/install-paravirt-many-disks.xml b/tests/install-paravirt-many-disks.xml
@@ -29,6 +29,7 @@
     </disk>
 
 
+    <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' keymap='ja' />
   </devices>
 </domain>
diff --git a/virtinst/FullVirtGuest.py b/virtinst/FullVirtGuest.py
@@ -160,6 +160,9 @@ def get_os_distro(self):
         return None
     os_distro = property(get_os_distro)
 
+    def get_input_device(self):
+        return ("tablet", "usb")
+
     def _get_features_xml(self):
         ret = "<features>\n"
         features = self.os_features()
diff --git a/virtinst/Guest.py b/virtinst/Guest.py
@@ -654,11 +654,18 @@ def _get_graphics_xml(self, install = True):
         gt = self.graphics["type"]
         return gt.get_xml_config()
 
+    def _get_input_xml(self, install = True):
+        """Get the input device config in libvirt XML format."""
+        (type,bus) = self.get_input_device()
+        return "    <input type='%s' bus='%s'/>" % (type, bus)
+
     def _get_device_xml(self, install = True):
         return """%(disks)s
 %(networks)s
+%(input)s
 %(graphics)s""" % { "disks": self._get_disk_xml(install), \
         "networks": self._get_network_xml(install), \
+        "input": self._get_input_xml(install), \
         "graphics": self._get_graphics_xml(install) }
 
     def get_config_xml(self, install = True, disk_boot = False):
diff --git a/virtinst/ParaVirtGuest.py b/virtinst/ParaVirtGuest.py
@@ -36,6 +36,9 @@ def _connectSerialConsole(self):
             os._exit(1)
         return child
 
+    def get_input_device(self):
+        return ("mouse", "xen")
+
     def validate_parms(self):
         if not self.location and not self.boot:
             raise ValueError, _("A location must be specified to install from")
