device: cleanup input device code

The current code was a little bit odd.  At first we've removed all
possible implicit input devices from domain definition to add them later
back if there was any graphics device defined while parsing XML
description.  That's not all, while formating domain definition to XML
description we at first ignore any input devices with bus different to
USB and VIRTIO and few lines later we add implicit input devices to XML.

This seems to me as a lot of code for nothing.  This patch may look
to be more complicated than original approach, but this is a preferred
way to modify/add driver specific stuff only in those drivers and not
deal with them in common parsing/formating functions.

The update is to add those implicit input devices into config XML to
follow the real HW configuration visible by guest OS.

There was also inconsistence between our behavior and QEMU's in the way,
that in QEMU there is no way how to disable those implicit input devices
for x86 architecture and they are available always, even without graphics
device.  This applies also to XEN hypervisor.  VZ driver already does its
part by putting correct implicit devices into live XML.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

src/Makefile.am

@@ -1212,7 +1212,7 @@ libvirt_driver_xen_impl_la_CFLAGS =				\
 		-I$(srcdir)/xenconfig				\
 		$(AM_CFLAGS)
 libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS)
+libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) libvirt_xenconfig.la
 libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES)
 endif WITH_XEN
 
@@ -1273,7 +1273,7 @@ if WITH_XENAPI
 noinst_LTLIBRARIES += libvirt_driver_xenapi.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la
 libvirt_driver_xenapi_la_CFLAGS = $(LIBXENSERVER_CFLAGS) $(CURL_CFLAGS) \
-		-I$(srcdir)/conf $(AM_CFLAGS)
+		-I$(srcdir)/conf -I$(srcdir)/xenconfig $(AM_CFLAGS)
 libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_xenapi_la_LIBADD = $(LIBXENSERVER_LIBS) $(CURL_LIBS)
 libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES)

src/conf/domain_conf.c

@@ -16043,27 +16043,6 @@ virDomainDefParseXML(xmlDocPtr xml,
             goto error;
         }
 
-        /* With QEMU / KVM / Xen graphics, mouse + PS/2 is implicit
-         * with graphics, so don't store it.
-         * XXX will this be true for other virt types ? */
-        if ((def->os.type == VIR_DOMAIN_OSTYPE_HVM &&
-             input->bus == VIR_DOMAIN_INPUT_BUS_PS2 &&
-             (input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ||
-              input->type == VIR_DOMAIN_INPUT_TYPE_KBD)) ||
-            (def->os.type == VIR_DOMAIN_OSTYPE_XEN &&
-             input->bus == VIR_DOMAIN_INPUT_BUS_XEN &&
-             (input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ||
-              input->type == VIR_DOMAIN_INPUT_TYPE_KBD)) ||
-            (def->os.type == VIR_DOMAIN_OSTYPE_EXE &&
-             (def->virtType == VIR_DOMAIN_VIRT_VZ ||
-              def->virtType == VIR_DOMAIN_VIRT_PARALLELS)  &&
-             input->bus == VIR_DOMAIN_INPUT_BUS_PARALLELS &&
-             (input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ||
-              input->type == VIR_DOMAIN_INPUT_TYPE_KBD))) {
-            virDomainInputDefFree(input);
-            continue;
-        }
-
         def->inputs[def->ninputs++] = input;
     }
     VIR_FREE(nodes);
@@ -16084,29 +16063,6 @@ virDomainDefParseXML(xmlDocPtr xml,
     }
     VIR_FREE(nodes);
 
-    /* If graphics are enabled, there's an implicit PS2 mouse */
-    if (def->ngraphics > 0 &&
-        (ARCH_IS_X86(def->os.arch) || def->os.arch == VIR_ARCH_NONE)) {
-        int input_bus = VIR_DOMAIN_INPUT_BUS_XEN;
-
-        if (def->os.type == VIR_DOMAIN_OSTYPE_HVM)
-            input_bus = VIR_DOMAIN_INPUT_BUS_PS2;
-        if (def->os.type == VIR_DOMAIN_OSTYPE_EXE &&
-            (def->virtType == VIR_DOMAIN_VIRT_VZ ||
-             def->virtType == VIR_DOMAIN_VIRT_PARALLELS))
-            input_bus = VIR_DOMAIN_INPUT_BUS_PARALLELS;
-
-        if (virDomainDefMaybeAddInput(def,
-                                      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)
         goto error;
@@ -20908,6 +20864,11 @@ virDomainInputDefFormat(virBufferPtr buf,
     const char *type = virDomainInputTypeToString(def->type);
     const char *bus = virDomainInputBusTypeToString(def->bus);
 
+    /* don't format keyboard into migratable XML for backward compatibility */
+    if (def->type == VIR_DOMAIN_INPUT_TYPE_KBD &&
+        flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)
+        return 0;
+
     if (!type) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unexpected input type %d"), def->type);
@@ -22362,11 +22323,10 @@ virDomainDefFormatInternal(virDomainDefPtr def,
         if (virDomainChrDefFormat(buf, def->channels[n], flags) < 0)
             goto error;
 
-    for (n = 0; n < def->ninputs; n++)
+    for (n = 0; n < def->ninputs; n++) {
-        if ((def->inputs[n]->bus == VIR_DOMAIN_INPUT_BUS_USB ||
+        if (virDomainInputDefFormat(buf, def->inputs[n], flags) < 0)
-             def->inputs[n]->bus == VIR_DOMAIN_INPUT_BUS_VIRTIO) &&
-            virDomainInputDefFormat(buf, def->inputs[n], flags) < 0)
             goto error;
+    }
 
     if (def->tpm) {
         if (virDomainTPMDefFormat(buf, def->tpm, flags) < 0)
@@ -22374,32 +22334,6 @@ virDomainDefFormatInternal(virDomainDefPtr def,
     }
 
     if (def->ngraphics > 0) {
-        /* If graphics is enabled, add the implicit mouse/keyboard */
-        if ((ARCH_IS_X86(def->os.arch)) || def->os.arch == VIR_ARCH_NONE) {
-            virDomainInputDef autoInput = {
-                .type = VIR_DOMAIN_INPUT_TYPE_MOUSE,
-                .info = { .alias = NULL },
-            };
-
-            if (def->os.type == VIR_DOMAIN_OSTYPE_HVM)
-                autoInput.bus = VIR_DOMAIN_INPUT_BUS_PS2;
-            else if (def->os.type == VIR_DOMAIN_OSTYPE_EXE &&
-                     (def->virtType == VIR_DOMAIN_VIRT_VZ ||
-                      def->virtType == VIR_DOMAIN_VIRT_PARALLELS))
-                autoInput.bus = VIR_DOMAIN_INPUT_BUS_PARALLELS;
-            else
-               autoInput.bus = VIR_DOMAIN_INPUT_BUS_XEN;
-
-            if (virDomainInputDefFormat(buf, &autoInput, flags) < 0)
-                goto error;
-
-            if (!(flags & VIR_DOMAIN_DEF_FORMAT_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/libxl/libxl_domain.c

@@ -35,6 +35,7 @@
 #include "virstring.h"
 #include "virtime.h"
 #include "locking/domain_lock.h"
+#include "xen_common.h"
 
 #define VIR_FROM_THIS VIR_FROM_LIBXL
 
@@ -396,6 +397,10 @@ libxlDomainDefPostParse(virDomainDefPtr def,
         def->consoles[0] = chrdef;
     }
 
+    /* add implicit input devices */
+    if (xenDomainDefAddImplicitInputDevice(def) < 0)
+        return -1;
+
     /* memory hotplug tunables are not supported by this driver */
     if (virDomainDefCheckUnsupportedMemoryHotplug(def) < 0)
         return -1;

src/qemu/qemu_domain.c

@@ -1034,6 +1034,25 @@ virDomainXMLNamespace virQEMUDriverDomainXMLNamespace = {
 };
 
 
+static int
+qemuDomainDefAddImplicitInputDevice(virDomainDef *def)
+{
+    if (ARCH_IS_X86(def->os.arch)) {
+        if (virDomainDefMaybeAddInput(def,
+                                      VIR_DOMAIN_INPUT_TYPE_MOUSE,
+                                      VIR_DOMAIN_INPUT_BUS_PS2) < 0)
+            return -1;
+
+        if (virDomainDefMaybeAddInput(def,
+                                      VIR_DOMAIN_INPUT_TYPE_KBD,
+                                      VIR_DOMAIN_INPUT_BUS_PS2) < 0)
+            return -1;
+    }
+
+    return 0;
+}
+
+
 static int
 qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
                                virQEMUCapsPtr qemuCaps)
@@ -1049,6 +1068,10 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
     bool addPanicDevice = false;
     int ret = -1;
 
+    /* add implicit input devices */
+    if (qemuDomainDefAddImplicitInputDevice(def) < 0)
+        goto cleanup;
+
     /* Add implicit PCI root controller if the machine has one */
     switch (def->os.arch) {
     case VIR_ARCH_I686:

src/xen/xen_driver.c

@@ -46,6 +46,7 @@
 
 #include "xen_sxpr.h"
 #include "xen_xm.h"
+#include "xen_common.h"
 #include "xen_hypervisor.h"
 #include "xend_internal.h"
 #include "xs_internal.h"
@@ -382,6 +383,10 @@ xenDomainDefPostParse(virDomainDefPtr def,
         def->memballoon = memballoon;
     }
 
+    /* add implicit input device */
+    if (xenDomainDefAddImplicitInputDevice(def) <0)
+        return -1;
+
     /* memory hotplug tunables are not supported by this driver */
     if (virDomainDefCheckUnsupportedMemoryHotplug(def) < 0)
         return -1;

src/xenapi/xenapi_driver.c

@@ -39,6 +39,7 @@
 #include "xenapi_driver_private.h"
 #include "xenapi_utils.h"
 #include "virstring.h"
+#include "xen_common.h"
 
 #define VIR_FROM_THIS VIR_FROM_XENAPI
 
@@ -79,6 +80,10 @@ xenapiDomainDefPostParse(virDomainDefPtr def,
                          unsigned int parseFlags ATTRIBUTE_UNUSED,
                          void *opaque ATTRIBUTE_UNUSED)
 {
+    /* add implicit input device */
+    if (xenDomainDefAddImplicitInputDevice(def) < 0)
+        return -1;
+
     /* memory hotplug tunables are not supported by this driver */
     if (virDomainDefCheckUnsupportedMemoryHotplug(def) < 0)
         return -1;

src/xenconfig/xen_common.c

@@ -1830,3 +1830,25 @@ xenFormatConfigCommon(virConfPtr conf,
 
     return 0;
 }
+
+
+int
+xenDomainDefAddImplicitInputDevice(virDomainDefPtr def)
+{
+    virDomainInputBus implicitInputBus = VIR_DOMAIN_INPUT_BUS_XEN;
+
+    if (def->os.type == VIR_DOMAIN_OSTYPE_HVM)
+        implicitInputBus = VIR_DOMAIN_INPUT_BUS_PS2;
+
+    if (virDomainDefMaybeAddInput(def,
+                                  VIR_DOMAIN_INPUT_TYPE_MOUSE,
+                                  implicitInputBus) < 0)
+        return -1;
+
+    if (virDomainDefMaybeAddInput(def,
+                                  VIR_DOMAIN_INPUT_TYPE_KBD,
+                                  implicitInputBus) < 0)
+        return -1;
+
+    return 0;
+}

src/xenconfig/xen_common.h

@@ -61,4 +61,6 @@ int xenFormatConfigCommon(virConfPtr conf,
                           virConnectPtr conn);
 
 
+int xenDomainDefAddImplicitInputDevice(virDomainDefPtr def);
+
 #endif /* __VIR_XEN_COMMON_H__ */

tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml

@@ -73,6 +73,8 @@
       <controller type='usb' index='0'/>
       <controller type='ide' index='0'/>
       <controller type='pci' index='0' model='pci-root'/>
+      <input type='mouse' bus='ps2'/>
+      <input type='keyboard' bus='ps2'/>
       <memballoon model='virtio'/>
     </devices>
   </domain>

tests/domainsnapshotxml2xmlout/external_vm_redefine.xml

@@ -38,6 +38,8 @@
       <controller type='usb' index='0'/>
       <controller type='ide' index='0'/>
       <controller type='pci' index='0' model='pci-root'/>
+      <input type='mouse' bus='ps2'/>
+      <input type='keyboard' bus='ps2'/>
       <memballoon model='virtio'/>
     </devices>
   </domain>

tests/domainsnapshotxml2xmlout/full_domain.xml

@@ -31,6 +31,8 @@
       <controller type='usb' index='0'/>
       <controller type='ide' index='0'/>
       <controller type='pci' index='0' model='pci-root'/>
+      <input type='mouse' bus='ps2'/>
+      <input type='keyboard' bus='ps2'/>
       <memballoon model='virtio'/>
     </devices>
   </domain>

tests/domainsnapshotxml2xmlout/metadata.xml

@@ -35,6 +35,8 @@
       <controller type='usb' index='0'/>
       <controller type='ide' index='0'/>
       <controller type='pci' index='0' model='pci-root'/>
+      <input type='mouse' bus='ps2'/>
+      <input type='keyboard' bus='ps2'/>
       <memballoon model='virtio'/>
     </devices>
   </domain>

tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+disk-scsi.xml

@@ -40,6 +40,8 @@
     <controller type='virtio-serial' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </controller>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
   <seclabel type='none' model='none'/>

tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+disk-usb.xml

@@ -39,6 +39,8 @@
     <controller type='virtio-serial' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </controller>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
   <seclabel type='none' model='none'/>

tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+disk-virtio.xml

@@ -40,6 +40,8 @@
     <controller type='virtio-serial' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </controller>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
   <seclabel type='none' model='none'/>

tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml

@@ -35,6 +35,8 @@
       <target type='serial' port='0'/>
     </console>
     <input type='tablet' bus='usb'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml

@@ -38,6 +38,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml

@@ -41,6 +41,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml

@@ -25,6 +25,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml

@@ -24,6 +24,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml

@@ -30,6 +30,8 @@
     <controller type='fdc' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml

@@ -24,6 +24,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.xml

@@ -24,6 +24,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml

@@ -27,6 +27,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml

@@ -23,6 +23,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml

@@ -49,6 +49,8 @@
       <model type='virtio'/>
       <boot order='2'/>
     </interface>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml

@@ -26,6 +26,8 @@
       <source path='/tmp/guestfwd'/>
       <target type='guestfwd' address='10.0.2.1' port='4600'/>
     </channel>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml

@@ -29,6 +29,8 @@
       <target type='virtio' name='org.linux-kvm.port.foo'/>
       <address type='virtio-serial' controller='1' bus='0' port='3'/>
     </channel>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-chardev-label.xml

@@ -35,6 +35,8 @@
       </source>
       <target type='serial' port='0'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
     <rng model='virtio'>
       <backend model='egd' type='pipe'>

tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.xml

@@ -32,6 +32,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml

@@ -23,6 +23,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.xml

@@ -21,6 +21,8 @@
     <emulator>/usr/bin/kvm</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml

@@ -23,6 +23,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml

@@ -29,6 +29,8 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml

@@ -38,6 +38,8 @@
     <console type='pty'>
       <target type='virtio' port='3'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.xml

@@ -24,6 +24,8 @@
     <emulator>/usr/bin/qemu</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.xml

@@ -24,6 +24,8 @@
     <emulator>/usr/bin/qemu</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml

@@ -19,6 +19,8 @@
     <emulator>/usr/bin/qemu</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-features.xml

@@ -28,6 +28,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.xml

@@ -32,6 +32,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml

@@ -21,6 +21,8 @@
     <emulator>/usr/bin/qemu</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.xml

@@ -23,6 +23,8 @@
     <emulator>/usr/bin/qemu</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml

@@ -23,6 +23,8 @@
     <emulator>/usr/bin/qemu</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched-zeropriority.xml

@@ -33,6 +33,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.xml

@@ -32,6 +32,8 @@
     <controller type='pci' index='2' model='pci-bridge'>
       <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/>
     </controller>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-cputune.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-active-commit.xml

@@ -32,6 +32,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml

@@ -29,6 +29,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml

@@ -46,6 +46,8 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.xml

@@ -23,6 +23,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml

@@ -24,6 +24,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml

@@ -30,6 +30,8 @@
     </disk>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.xml

@@ -33,6 +33,8 @@
     </disk>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.xml

@@ -30,6 +30,8 @@
     </disk>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.xml

@@ -35,6 +35,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml

@@ -32,6 +32,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.xml

@@ -33,6 +33,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml

@@ -57,6 +57,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml

@@ -30,6 +30,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml

@@ -36,6 +36,8 @@
     <controller type='fdc' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml

@@ -41,6 +41,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml

@@ -51,6 +51,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml

@@ -28,6 +28,8 @@
     <controller type='ide' index='0'/>
     <controller type='scsi' index='0' model='lsilogic'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml

@@ -34,6 +34,8 @@
     <controller type='scsi' index='0' model='virtio-scsi'/>
     <controller type='scsi' index='1' model='lsilogic'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml

@@ -28,6 +28,8 @@
     <controller type='scsi' index='1' model='lsilogic'/>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.xml

@@ -28,6 +28,8 @@
     <controller type='scsi' index='0' model='lsisas1078'/>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml

@@ -28,6 +28,8 @@
     <controller type='scsi' index='0' model='virtio-scsi'/>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml

@@ -28,6 +28,8 @@
     <controller type='scsi' index='0' model='ibmvscsi'/>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.xml

@@ -42,6 +42,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml

@@ -28,6 +28,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.xml

@@ -24,6 +24,8 @@
       <driver cmd_per_lun='50'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.xml

@@ -24,6 +24,8 @@
       <driver ioeventfd='on'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.xml

@@ -24,6 +24,8 @@
       <driver max_sectors='512'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml

@@ -24,6 +24,8 @@
       <driver queues='8'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml

@@ -40,6 +40,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml

@@ -40,6 +40,8 @@
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='none'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml

@@ -25,6 +25,8 @@
     </disk>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.xml

@@ -21,6 +21,8 @@
     <emulator>/usr/bin/qemu</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.xml

@@ -21,6 +21,8 @@
     <emulator>/usr/bin/qemu</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml

@@ -46,6 +46,8 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml

@@ -25,6 +25,8 @@
     <controller type='ide' index='0'/>
     <controller type='fdc' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>