conf: Add keyboard input device type

There is no keyboard support currently in libvirt.

For some platforms (PPC64 QEMU) this makes graphics unusable,
since the keyboard is not implicit and it can't be added via libvirt.

Signed-off-by: Li Zhang <zhlcindy@linux.vnet.ibm.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>

docs/schemas/domaincommon.rng

@@ -3269,6 +3269,7 @@
         <choice>
           <value>tablet</value>
           <value>mouse</value>
+          <value>keyboard</value>
         </choice>
       </attribute>
       <optional>

src/conf/domain_conf.c

@@ -507,7 +507,8 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
 
 VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST,
               "mouse",
-              "tablet")
+              "tablet",
+              "keyboard")
 
 VIR_ENUM_IMPL(virDomainInputBus, VIR_DOMAIN_INPUT_BUS_LAST,
               "ps2",
@@ -7773,7 +7774,7 @@ error:
 
 /* Parse the XML definition for an input device */
 static virDomainInputDefPtr
-virDomainInputDefParseXML(const char *ostype,
+virDomainInputDefParseXML(const virDomainDef *dom,
                           xmlNodePtr node,
                           unsigned int flags)
 {
@@ -7806,9 +7807,10 @@ virDomainInputDefParseXML(const char *ostype,
             goto error;
         }
 
-        if (STREQ(ostype, "hvm")) {
+        if (STREQ(dom->os.type, "hvm")) {
-            if (def->bus == VIR_DOMAIN_INPUT_BUS_PS2 && /* Only allow mouse for ps2 */
+            if (def->bus == VIR_DOMAIN_INPUT_BUS_PS2 &&
-                def->type != VIR_DOMAIN_INPUT_TYPE_MOUSE) {
+                def->type != VIR_DOMAIN_INPUT_TYPE_MOUSE &&
+                def->type != VIR_DOMAIN_INPUT_TYPE_KBD) {
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                _("ps2 bus does not support %s input device"),
                                type);
@@ -7826,7 +7828,8 @@ virDomainInputDefParseXML(const char *ostype,
                                _("unsupported input bus %s"),
                                bus);
             }
-            if (def->type != VIR_DOMAIN_INPUT_TYPE_MOUSE) {
+            if (def->type != VIR_DOMAIN_INPUT_TYPE_MOUSE &&
+                def->type != VIR_DOMAIN_INPUT_TYPE_KBD) {
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                _("xen bus does not support %s input device"),
                                type);
@@ -7834,8 +7837,9 @@ virDomainInputDefParseXML(const char *ostype,
             }
         }
     } else {
-        if (STREQ(ostype, "hvm")) {
+        if (STREQ(dom->os.type, "hvm")) {
-            if (def->type == VIR_DOMAIN_INPUT_TYPE_MOUSE)
+            if ((def->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ||
+                def->type == VIR_DOMAIN_INPUT_TYPE_KBD))
                 def->bus = VIR_DOMAIN_INPUT_BUS_PS2;
             else
                 def->bus = VIR_DOMAIN_INPUT_BUS_USB;
@@ -9857,7 +9861,7 @@ virDomainDeviceDefParse(const char *xmlStr,
             goto error;
         break;
     case VIR_DOMAIN_DEVICE_INPUT:
-        if (!(dev->data.input = virDomainInputDefParseXML(def->os.type,
+        if (!(dev->data.input = virDomainInputDefParseXML(def,
                                                           node, flags)))
             goto error;
         break;
@@ -12442,7 +12446,7 @@ virDomainDefParseXML(xmlDocPtr xml,
         goto error;
 
     for (i = 0; i < n; i++) {
-        virDomainInputDefPtr input = virDomainInputDefParseXML(def->os.type,
+        virDomainInputDefPtr input = virDomainInputDefParseXML(def,
                                                                nodes[i],
                                                                flags);
         if (!input)
@@ -12462,10 +12466,12 @@ virDomainDefParseXML(xmlDocPtr xml,
          * XXX will this be true for other virt types ? */
         if ((STREQ(def->os.type, "hvm") &&
              input->bus == VIR_DOMAIN_INPUT_BUS_PS2 &&
-             input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE) ||
+             (input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ||
+              input->type == VIR_DOMAIN_INPUT_TYPE_KBD)) ||
             (STRNEQ(def->os.type, "hvm") &&
              input->bus == VIR_DOMAIN_INPUT_BUS_XEN &&
-             input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE)) {
+             (input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ||
+              input->type == VIR_DOMAIN_INPUT_TYPE_KBD))) {
             virDomainInputDefFree(input);
             continue;
         }
@@ -12502,8 +12508,12 @@ virDomainDefParseXML(xmlDocPtr xml,
                                       VIR_DOMAIN_INPUT_TYPE_MOUSE,
                                       input_bus) < 0)
             goto error;
-    }
 
+        if (virDomainDefMaybeAddInput(def,
+                                      VIR_DOMAIN_INPUT_TYPE_KBD,
+                                      input_bus) < 0)
+            goto error;
+    }
 
     /* analysis of the sound devices */
     if ((n = virXPathNodeSet("./devices/sound", ctxt, &nodes)) < 0) {
@@ -17520,7 +17530,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
     }
 
     if (def->ngraphics > 0) {
-        /* If graphics is enabled, add the implicit mouse */
+        /* If graphics is enabled, add the implicit mouse/keyboard */
         virDomainInputDef autoInput = {
             VIR_DOMAIN_INPUT_TYPE_MOUSE,
             STREQ(def->os.type, "hvm") ?
@@ -17531,6 +17541,12 @@ virDomainDefFormatInternal(virDomainDefPtr def,
         if (virDomainInputDefFormat(buf, &autoInput, flags) < 0)
             goto error;
 
+        if (!(flags & VIR_DOMAIN_XML_MIGRATABLE)) {
+            autoInput.type = VIR_DOMAIN_INPUT_TYPE_KBD;
+            if (virDomainInputDefFormat(buf, &autoInput, flags) < 0)
+                goto error;
+        }
+
         for (n = 0; n < def->ngraphics; n++)
             if (virDomainGraphicsDefFormat(buf, def->graphics[n], flags) < 0)
                 goto error;

src/conf/domain_conf.h

@@ -1239,6 +1239,7 @@ struct _virDomainTPMDef {
 enum virDomainInputType {
     VIR_DOMAIN_INPUT_TYPE_MOUSE,
     VIR_DOMAIN_INPUT_TYPE_TABLET,
+    VIR_DOMAIN_INPUT_TYPE_KBD,
 
     VIR_DOMAIN_INPUT_TYPE_LAST
 };

tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml

@@ -104,6 +104,7 @@
       <alias name='input0'/>
     </input>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5900' autoport='yes' listen='0.0.0.0'>
       <listen type='address' address='0.0.0.0'/>
     </graphics>

tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml

@@ -99,6 +99,7 @@
       <alias name='input0'/>
     </input>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5900' autoport='yes' listen='0.0.0.0'>
       <listen type='address' address='0.0.0.0'/>
     </graphics>

tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml

@@ -23,6 +23,7 @@
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no'>
       <listen type='network' network='Bobsnetwork'/>
     </graphics>

tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml

@@ -22,6 +22,7 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' listen='1.2.3.4' autoport='yes'>
       <listen type='address' address='1.2.3.4'/>
       <listen type='network' network='Bobsnetwork'/>

tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml

@@ -24,6 +24,7 @@
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='sdl' display=':0.1' xauth='/root/.Xauthority' fullscreen='yes'/>
     <video>
       <model type='cirrus' vram='9216' heads='1'/>

tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml

@@ -24,6 +24,7 @@
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='sdl' display=':0.1' xauth='/root/.Xauthority'/>
     <video>
       <model type='vga' vram='9216' heads='1'/>

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml

@@ -23,6 +23,7 @@
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1'>
       <listen type='address' address='127.0.0.1'/>
       <image compression='auto_glz'/>

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml

@@ -23,6 +23,7 @@
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1'>
       <listen type='address' address='127.0.0.1'/>
       <channel name='main' mode='secure'/>

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml

@@ -71,6 +71,7 @@
     </console>
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='spice' port='5900' autoport='no' passwd='sercet' passwdValidTo='2011-05-31T16:11:22' connected='disconnect'/>
     <sound model='ac97'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml

@@ -23,6 +23,7 @@
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1' defaultMode='secure'>
       <listen type='address' address='127.0.0.1'/>
       <channel name='main' mode='secure'/>

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml

@@ -24,6 +24,7 @@
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5900' autoport='no' listen='127.0.0.1' sharePolicy='allow-exclusive'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml

@@ -24,6 +24,7 @@
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml

@@ -24,6 +24,7 @@
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' socket='/tmp/foo.socket'/>
     <video>
       <model type='cirrus' vram='9216' heads='1'/>

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml

@@ -24,6 +24,7 @@
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml

@@ -17,6 +17,7 @@
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5900' autoport='no' websocket='5700' listen='127.0.0.1'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml

@@ -24,6 +24,7 @@
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' listen='2001:1:2:3:4:5:1234:1234'>
       <listen type='address' address='2001:1:2:3:4:5:1234:1234'/>
     </graphics>

tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml

@@ -22,6 +22,7 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml

@@ -60,6 +60,7 @@
     </console>
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <sound model='ac97'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml

@@ -196,6 +196,7 @@
       <model type='e1000'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml

@@ -31,6 +31,7 @@
     <controller type='scsi' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='sdl'/>
     <video>
       <model type='cirrus' vram='9216' heads='1'/>

tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml

@@ -32,6 +32,7 @@
     </console>
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml

@@ -23,6 +23,7 @@
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='1.2.3.4'>
       <listen type='address' address='1.2.3.4'/>
       <listen type='network' network='Bobsnetwork'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml

@@ -74,6 +74,7 @@
     </console>
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='spice' port='5900' autoport='no' passwd='sercet' passwdValidTo='2011-05-31T16:11:22' connected='disconnect'/>
     <sound model='ac97'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

tests/sexpr2xmldata/sexpr2xml-curmem.xml

@@ -31,6 +31,7 @@
       <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml

@@ -43,6 +43,7 @@
     </console>
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5925' autoport='yes' keymap='en-us'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml

@@ -36,6 +36,7 @@
       <target dev='vif3.0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml

@@ -39,6 +39,7 @@
       <model type='e1000'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml

@@ -39,6 +39,7 @@
       <model type='e1000'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml

@@ -36,6 +36,7 @@
       <target dev='vif3.0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml

@@ -37,6 +37,7 @@
       <model type='e1000'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml

@@ -37,6 +37,7 @@
       <model type='netfront'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml

@@ -41,6 +41,7 @@
       <target port='0'/>
     </parallel>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml

@@ -48,6 +48,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml

@@ -44,6 +44,7 @@
       <target type='serial' port='1'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml

@@ -44,6 +44,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml

@@ -42,6 +42,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml

@@ -44,6 +44,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml

@@ -42,6 +42,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml

@@ -42,6 +42,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml

@@ -46,6 +46,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml

@@ -46,6 +46,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml

@@ -46,6 +46,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml

@@ -44,6 +44,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml

@@ -36,6 +36,7 @@
       <target dev='vif3.0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
     <sound model='sb16'/>
     <sound model='es1370'/>

tests/sexpr2xmldata/sexpr2xml-fv-sound.xml

@@ -36,6 +36,7 @@
       <target dev='vif3.0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
     <sound model='sb16'/>
     <sound model='es1370'/>

tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml

@@ -37,6 +37,7 @@
     </interface>
     <input type='mouse' bus='usb'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml

@@ -37,6 +37,7 @@
     </interface>
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-utc.xml

@@ -36,6 +36,7 @@
       <target dev='vif3.0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv-v2.xml

@@ -36,6 +36,7 @@
       <target dev='vif3.0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-fv.xml

@@ -36,6 +36,7 @@
       <target dev='vif3.0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml

@@ -41,6 +41,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
   </devices>
 </domain>

tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml

@@ -24,6 +24,7 @@
       <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='5925' autoport='no' listen='0.0.0.0' keymap='ja'>
       <listen type='address' address='0.0.0.0'/>
     </graphics>

tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml

@@ -24,6 +24,7 @@
       <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0' keymap='ja'>
       <listen type='address' address='0.0.0.0'/>
     </graphics>

tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml

@@ -24,6 +24,7 @@
       <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0' keymap='ja'>
       <listen type='address' address='0.0.0.0'/>
     </graphics>

tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml

@@ -29,6 +29,7 @@
       <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
   </devices>
 </domain>

tests/vmx2xmldata/vmx2xml-graphics-vnc.xml

@@ -12,6 +12,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='5903' autoport='no' keymap='de' passwd='password'/>
     <video>
       <model type='vmvga' vram='4096'/>

tests/xmconfigdata/test-escape-paths.xml

@@ -43,6 +43,7 @@
       <model type='e1000'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-force-hpet.xml

@@ -40,6 +40,7 @@
       <model type='e1000'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-force-nohpet.xml

@@ -40,6 +40,7 @@
       <model type='e1000'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-localtime.xml

@@ -38,6 +38,7 @@
       <model type='e1000'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-net-ioemu.xml

@@ -38,6 +38,7 @@
       <model type='e1000'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-net-netfront.xml

@@ -38,6 +38,7 @@
       <model type='netfront'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-new-cdrom.xml

@@ -38,6 +38,7 @@
       <model type='e1000'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-old-cdrom.xml

@@ -38,6 +38,7 @@
       <model type='e1000'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-parallel-tcp.xml

@@ -43,6 +43,7 @@
       <target port='0'/>
     </parallel>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml

@@ -50,6 +50,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml

@@ -46,6 +46,7 @@
       <target type='serial' port='1'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-serial-file.xml

@@ -46,6 +46,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-serial-null.xml

@@ -44,6 +44,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-serial-pipe.xml

@@ -46,6 +46,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-serial-pty.xml

@@ -44,6 +44,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-serial-stdio.xml

@@ -44,6 +44,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml

@@ -48,6 +48,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-serial-tcp.xml

@@ -48,6 +48,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-serial-udp.xml

@@ -48,6 +48,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-serial-unix.xml

@@ -46,6 +46,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-sound.xml

@@ -38,6 +38,7 @@
       <model type='e1000'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-usbmouse.xml

@@ -39,6 +39,7 @@
     </interface>
     <input type='mouse' bus='usb'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-usbtablet.xml

@@ -39,6 +39,7 @@
     </interface>
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-fullvirt-utc.xml

@@ -38,6 +38,7 @@
       <model type='e1000'/>
     </interface>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-no-source-cdrom.xml

@@ -43,6 +43,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
   </devices>
 </domain>

tests/xmconfigdata/test-paravirt-net-e1000.xml

@@ -28,6 +28,7 @@
       <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-paravirt-net-vifname.xml

@@ -29,6 +29,7 @@
       <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml

@@ -27,6 +27,7 @@
       <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='5925' autoport='no' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-paravirt-new-pvfb.xml

@@ -27,6 +27,7 @@
       <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml

@@ -27,6 +27,7 @@
       <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='5925' autoport='no' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-paravirt-old-pvfb.xml

@@ -27,6 +27,7 @@
       <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>

tests/xmconfigdata/test-pci-devs.xml

@@ -43,6 +43,7 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
       <source>