1:30 p.m.
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 could seems
to be more complicated than original approach, but this is a preferred
way to modify/add driver specific staff only in those drivers and not
deal with them in common parsing/formating functions.
The update is to add those implicit input devices only into running XML
and don't put them automatically to offline XML. In addition we won't
remove any input devices specified by user.
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
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(a)redhat.com>
---
src/Makefile.am | 2 +-
src/conf/domain_conf.c | 77 +---------------------
src/libxl/libxl_domain.c | 4 ++
src/qemu/qemu_domain.c | 19 ++++++
src/qemu/qemu_domain.h | 1 +
src/qemu/qemu_process.c | 3 +
src/xen/xend_internal.c | 10 +++
src/xenapi/xenapi_driver.c | 8 +++
src/xenconfig/xen_common.c | 22 +++++++
src/xenconfig/xen_common.h | 2 +
.../qemuxml2argv-graphics-listen-network.xml | 2 -
.../qemuxml2argv-graphics-listen-network2.xml | 2 -
.../qemuxml2argv-graphics-sdl-fullscreen.xml | 2 -
.../qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 2 -
...qemuxml2argv-graphics-spice-agent-file-xfer.xml | 1 -
.../qemuxml2argv-graphics-spice-compression.xml | 2 -
.../qemuxml2argv-graphics-spice-listen-network.xml | 1 -
.../qemuxml2argv-graphics-spice-qxl-vga.xml | 2 -
.../qemuxml2argv-graphics-spice-sasl.xml | 1 -
.../qemuxml2argv-graphics-spice-timeout.xml | 2 -
.../qemuxml2argv-graphics-spice.xml | 2 -
.../qemuxml2argv-graphics-vnc-policy.xml | 2 -
.../qemuxml2argv-graphics-vnc-sasl.xml | 2 -
.../qemuxml2argv-graphics-vnc-socket.xml | 2 -
.../qemuxml2argv-graphics-vnc-tls.xml | 2 -
.../qemuxml2argv-graphics-vnc-websocket.xml | 2 -
.../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 -
.../qemuxml2argv-pci-autoadd-addr.xml | 1 -
.../qemuxml2argv-pci-autoadd-idx.xml | 1 -
.../qemuxml2xmlout-graphics-listen-network2.xml | 2 -
.../qemuxml2xmlout-graphics-spice-timeout.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-curmem.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 -
.../sexpr2xml-fv-serial-dev-2-ports.xml | 2 -
.../sexpr2xml-fv-serial-dev-2nd-port.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 -
.../sexpr2xml-fv-serial-tcp-telnet.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 -
.../sexpr2xml-pv-vfb-new-vncdisplay.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 2 -
tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml | 2 -
.../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 2 -
tests/vmx2xmldata/vmx2xml-graphics-vnc.xml | 2 -
.../test-fullvirt-direct-kernel-boot.xml | 2 -
tests/xlconfigdata/test-fullvirt-multiusb.xml | 2 -
tests/xlconfigdata/test-new-disk.xml | 2 -
tests/xlconfigdata/test-spice-features.xml | 2 -
tests/xlconfigdata/test-spice.xml | 2 -
tests/xmconfigdata/test-escape-paths.xml | 2 -
.../xmconfigdata/test-fullvirt-default-feature.xml | 2 -
tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 -
tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 -
tests/xmconfigdata/test-fullvirt-localtime.xml | 2 -
tests/xmconfigdata/test-fullvirt-net-ioemu.xml | 2 -
tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 -
tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 -
tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 2 -
tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 -
.../test-fullvirt-serial-dev-2-ports.xml | 2 -
.../test-fullvirt-serial-dev-2nd-port.xml | 2 -
tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 -
tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 -
tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 -
tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 -
tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 -
.../test-fullvirt-serial-tcp-telnet.xml | 2 -
tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 -
tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 -
tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 -
tests/xmconfigdata/test-fullvirt-sound.xml | 2 -
tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 -
.../test-fullvirt-usbtablet-no-bus.xml | 1 -
tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 -
tests/xmconfigdata/test-fullvirt-utc.xml | 2 -
tests/xmconfigdata/test-no-source-cdrom.xml | 2 -
tests/xmconfigdata/test-paravirt-net-e1000.xml | 2 -
tests/xmconfigdata/test-paravirt-net-vifname.xml | 2 -
.../test-paravirt-new-pvfb-vncdisplay.xml | 2 -
tests/xmconfigdata/test-paravirt-new-pvfb.xml | 2 -
.../test-paravirt-old-pvfb-vncdisplay.xml | 2 -
tests/xmconfigdata/test-paravirt-old-pvfb.xml | 2 -
tests/xmconfigdata/test-pci-devs.xml | 2 -
103 files changed, 73 insertions(+), 255 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 7219f7c..efb0e72 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1210,7 +1210,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
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 2f5c0ed..2812e8d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -15804,27 +15804,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);
@@ -15845,29 +15824,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;
@@ -22086,11 +22042,10 @@ virDomainDefFormatInternal(virDomainDefPtr def,
if (virDomainChrDefFormat(buf, def->channels[n], flags) < 0)
goto error;
- for (n = 0; n < def->ninputs; n++)
- if ((def->inputs[n]->bus == VIR_DOMAIN_INPUT_BUS_USB ||
- def->inputs[n]->bus == VIR_DOMAIN_INPUT_BUS_VIRTIO) &&
- virDomainInputDefFormat(buf, def->inputs[n], flags) < 0)
+ for (n = 0; n < def->ninputs; n++) {
+ if (virDomainInputDefFormat(buf, def->inputs[n], flags) < 0)
goto error;
+ }
if (def->tpm) {
if (virDomainTPMDefFormat(buf, def->tpm, flags) < 0)
@@ -22098,32 +22053,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;
diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 9551f2e..8625996 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -35,6 +35,7 @@
#include "virstring.h"
#include "virtime.h"
#include "locking/domain_lock.h"
+#include "xenconfig/xen_common.h"
#define VIR_FROM_THIS VIR_FROM_LIBXL
@@ -1010,6 +1011,9 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm,
vm->def, VIR_HOSTDEV_SP_PCI) < 0)
goto cleanup;
+ if (xenDomainDefAddImplicitInputDevice(vm->def) < 0)
+ goto cleanup;
+
if (virDomainLockProcessStart(driver->lockManager,
"xen:///system",
vm,
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index a872598..736624e 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3883,6 +3883,25 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
}
+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;
+}
+
+
bool
qemuDomainMachineHasBuiltinIDE(const virDomainDef *def)
{
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 14892fd..7f83d3c 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -503,5 +503,6 @@ bool qemuDomainRequiresMlock(virDomainDefPtr def);
int qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
virQEMUCapsPtr qemuCaps,
const virDomainMemoryDef *mem);
+int qemuDomainDefAddImplicitInputDevice(virDomainDef *def);
#endif /* __QEMU_DOMAIN_H__ */
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 4201962..f895667 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4663,6 +4663,9 @@ qemuProcessLaunch(virConnectPtr conn,
if (!qemuValidateCpuMax(vm->def, priv->qemuCaps))
goto cleanup;
+ if (qemuDomainDefAddImplicitInputDevice(vm->def) < 0)
+ goto cleanup;
+
if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0)
goto cleanup;
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 21d99e3..e3d10fd 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -57,6 +57,7 @@
#include "viruri.h"
#include "device_conf.h"
#include "virstring.h"
+#include "src/xenconfig/xen_common.h"
/* required for cpumap_t */
#include <xen/dom0_ops.h>
@@ -1574,6 +1575,7 @@ xenDaemonDomainFetch(virConnectPtr conn, int domid, const char
*name,
int id;
char * tty;
int vncport;
+ int state;
if (name)
root = sexpr_get(conn, "/xend/domain/%s?detail=1", name);
@@ -1598,6 +1600,14 @@ xenDaemonDomainFetch(virConnectPtr conn, int domid, const char
*name,
vncport)))
goto cleanup;
+ state = sexpr_to_xend_domain_state(def, root);
+ if (state == VIR_DOMAIN_RUNNING &&
+ xenDomainDefAddImplicitInputDevice(def) < 0) {
+ virObjectUnref(def);
+ def = NULL;
+ goto cleanup;
+ }
+
cleanup:
sexpr_free(root);
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index e503974..629e482 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -39,6 +39,7 @@
#include "xenapi_driver_private.h"
#include "xenapi_utils.h"
#include "virstring.h"
+#include "src/xenconfig/xen_common.h"
#define VIR_FROM_THIS VIR_FROM_XENAPI
@@ -1404,6 +1405,7 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
struct xen_vif_set *vif_set = NULL;
char *xml;
unsigned int vcpus;
+ enum xen_vm_power_state powerState = XEN_VM_POWER_STATE_UNDEFINED;
/* Flags checked by virDomainDefFormat */
@@ -1569,6 +1571,12 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
}
xen_vif_set_free(vif_set);
}
+
+ xen_vm_get_power_state(session, &powerState, vm);
+ if (mapPowerState(powerState) == VIR_DOMAIN_RUNNING &&
+ xenDomainDefAddImplicitInputDevice(defPtr) < 0)
+ goto error;
+
xen_vm_set_free(vms);
xml = virDomainDefFormat(defPtr, flags);
virDomainDefFree(defPtr);
diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index ed6978f..ba1f8ed 100644
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -1863,3 +1863,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;
+}
diff --git a/src/xenconfig/xen_common.h b/src/xenconfig/xen_common.h
index 0116703..0207cf7 100644
--- a/src/xenconfig/xen_common.h
+++ b/src/xenconfig/xen_common.h
@@ -62,4 +62,6 @@ int xenFormatConfigCommon(virConfPtr conf,
virConnectPtr conn,
int xendConfigVersion);
+int xenDomainDefAddImplicitInputDevice(virDomainDefPtr def);
+
#endif /* __VIR_XEN_COMMON_H__ */
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml
index bf78ca8..0ec2457 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml
@@ -22,8 +22,6 @@
<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'/>
<graphics type='vnc' port='5903' autoport='no'>
<listen type='network' network='Bobsnetwork'/>
</graphics>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml
index 62353e9..1208045 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml
@@ -21,8 +21,6 @@
</disk>
<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'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
index 1bac0b5..1a4b436 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml
@@ -23,8 +23,6 @@
<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'/>
<graphics type='sdl' display=':0.1'
xauth='/root/.Xauthority' fullscreen='yes'/>
<video>
<model type='cirrus' vram='16384' heads='1'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
index 5f94052..3391268 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
@@ -23,8 +23,6 @@
<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'/>
<graphics type='sdl' display=':0.1'
xauth='/root/.Xauthority'/>
<video>
<model type='vga' vram='16384' heads='1'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml
index 3a3e366..cb2e444 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml
@@ -22,7 +22,6 @@
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' 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'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml
index c13327a..a4d9f9a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml
@@ -22,8 +22,6 @@
<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'/>
<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'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml
index 34971fe..75d4717 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml
@@ -22,7 +22,6 @@
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' bus='ps2'/>
<graphics autoport='yes' connected='disconnect'
keymap='en-us' passwd='password'
passwdValidTo='2013-06-20T01:34:37' port='5900' tlsPort='5901'
type='spice'>
<listen address='10.65.210.231' network='vdsm-rhevm'
type='network'/>
<channel mode='secure' name='main'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml
index ac705f3..b0f4ce8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml
@@ -22,8 +22,6 @@
<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'/>
<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'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml
index d86cd56..248c6fd 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml
@@ -23,7 +23,6 @@
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' 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'/>
</graphics>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
index bfb189c..5060600 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
@@ -70,8 +70,6 @@
<target type='serial' port='0'/>
</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'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
index 0c61ee5..a9bb101 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
@@ -22,8 +22,6 @@
<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'/>
<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'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
index 1c76ddc..44b254d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml
@@ -23,8 +23,6 @@
<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'/>
<graphics type='vnc' port='65530' autoport='no'
listen='::' sharePolicy='allow-exclusive'>
<listen type='address' address='::'/>
</graphics>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
index e350142..35a39c8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
@@ -23,8 +23,6 @@
<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'/>
<graphics type='vnc' port='5903' autoport='no'
listen='127.0.0.1'>
<listen type='address' address='127.0.0.1'/>
</graphics>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
index de70bc4..78b92dc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml
@@ -23,8 +23,6 @@
<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'/>
<graphics type='vnc' socket='/tmp/foo.socket'/>
<video>
<model type='cirrus' vram='16384' heads='1'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
index e350142..35a39c8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
@@ -23,8 +23,6 @@
<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'/>
<graphics type='vnc' port='5903' autoport='no'
listen='127.0.0.1'>
<listen type='address' address='127.0.0.1'/>
</graphics>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
index afa4b5a..989dc99 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml
@@ -16,8 +16,6 @@
<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'/>
<graphics type='vnc' port='5900' autoport='no'
websocket='5700' listen='127.0.0.1'>
<listen type='address' address='127.0.0.1'/>
</graphics>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
index 3313469..6e69e2d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
@@ -23,8 +23,6 @@
<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'/>
<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>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml
b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml
index f8b0fc7..b60c0ae 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml
@@ -32,7 +32,6 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <input type='mouse' bus='ps2'/>
<video>
<model type='cirrus' vram='16384' heads='1'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml
b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml
index db2fee9..267c37c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml
@@ -33,7 +33,6 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
<controller type='pci' index='8' model='pci-bridge'/>
- <input type='mouse' bus='ps2'/>
<video>
<model type='cirrus' vram='16384' heads='1'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml
index abee7b6..1676d48 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml
@@ -22,8 +22,6 @@
<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'/>
<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'/>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
index 4f4f47c..c819590 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
@@ -73,8 +73,6 @@
<target type='serial' port='0'/>
</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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml
b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
index 4ac263e..e23815b 100644
--- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
@@ -31,8 +31,6 @@
<console type='pty'>
<target type='xen' port='0'/>
</console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
index 17e723e..9cce35f 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
@@ -46,8 +46,6 @@
<target type='serial' port='0'/>
</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'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
index 9494ec2..8fdcabd 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<target dev='vif3.0'/>
</interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no'
keymap='ja'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
index af1303b..d09805b 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
@@ -42,8 +42,6 @@
<target dev='vif1.0'/>
<model type='e1000'/>
</interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
index 406f3ed..0b9cfef 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
@@ -42,8 +42,6 @@
<target dev='vif1.0'/>
<model type='e1000'/>
</interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
index bc2ccec..e2958d2 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<target dev='vif3.0'/>
</interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no'
keymap='ja'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml
index ec75365..7b1a44e 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml
@@ -40,8 +40,6 @@
<target dev='vif3.0'/>
<model type='e1000'/>
</interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no'
keymap='ja'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
index f92ea4b..e2224af 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
@@ -40,8 +40,6 @@
<target dev='vif3.0'/>
<model type='netfront'/>
</interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no'
keymap='ja'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
index 3bc6490..03fccc8 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
@@ -44,8 +44,6 @@
<protocol type='raw'/>
<target port='0'/>
</parallel>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
index d1b5134..7a46081 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
@@ -51,8 +51,6 @@
<source path='/dev/ttyS0'/>
<target type='serial' port='0'/>
</console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
index 1c5a047..8024d31 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
@@ -47,8 +47,6 @@
<source path='/dev/ttyS1'/>
<target type='serial' port='1'/>
</console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
index 680528e..1ce3540 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
@@ -47,8 +47,6 @@
<source path='/tmp/serial.log'/>
<target type='serial' port='0'/>
</console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
index 1a7f866..08f3eee 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
@@ -45,8 +45,6 @@
<console type='null'>
<target type='serial' port='0'/>
</console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
index b15a1bc..ad23dce 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
@@ -47,8 +47,6 @@
<source path='/tmp/serial.pipe'/>
<target type='serial' port='0'/>
</console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
index e827f1d..b8c2a4b 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
@@ -45,8 +45,6 @@
<console type='pty'>
<target type='serial' port='0'/>
</console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
index 3d79428..2facd90 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
@@ -45,8 +45,6 @@
<console type='stdio'>
<target type='serial' port='0'/>
</console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
index 7dec0c8..0ac0ce2 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
@@ -49,8 +49,6 @@
<protocol type='telnet'/>
<target type='serial' port='0'/>
</console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
index 4f4b89b..084422a 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
@@ -49,8 +49,6 @@
<protocol type='raw'/>
<target type='serial' port='0'/>
</console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
index cf1fc3b..d76b88e 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
@@ -49,8 +49,6 @@
<source mode='connect' host='localhost'
service='9998'/>
<target type='serial' port='0'/>
</console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
index a1d15f5..5e60d87 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
@@ -47,8 +47,6 @@
<source mode='bind' path='/tmp/serial.sock'/>
<target type='serial' port='0'/>
</console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5901' autoport='no'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
index 4311b0c..ebadced 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
index 4311b0c..ebadced 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
index 103cfbe..b0e76ae 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
@@ -40,8 +40,6 @@
<target dev='vif3.0'/>
</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'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
index 728e852..ed83db6 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
@@ -40,8 +40,6 @@
<target dev='vif3.0'/>
</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'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
index 7899baa..6933c59 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<target dev='vif3.0'/>
</interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no'
keymap='ja'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
index af5fbe1..451a693 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<target dev='vif3.0'/>
</interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'
keymap='ja'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml
index 7899baa..6933c59 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<target dev='vif3.0'/>
</interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5903' autoport='no'
keymap='ja'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
index 384ff8b..5e9ce30 100644
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
@@ -44,8 +44,6 @@
<console type='pty'>
<target type='serial' port='0'/>
</console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
index eacfc97..092b2f4 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
@@ -24,8 +24,6 @@
<console type='pty'>
<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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
index f5b80c8..6a308d4 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
@@ -24,8 +24,6 @@
<console type='pty'>
<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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
index f5b80c8..6a308d4 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
@@ -24,8 +24,6 @@
<console type='pty'>
<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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
index 0aebf20..343ebf6 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
@@ -29,8 +29,6 @@
<console type='pty'>
<target type='xen' port='0'/>
</console>
- <input type='mouse' bus='xen'/>
- <input type='keyboard' bus='xen'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml
b/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml
index a9122be..9fee026 100644
--- a/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml
+++ b/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml
@@ -11,8 +11,6 @@
<on_reboot>restart</on_reboot>
<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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
index d59aa21..9a24645 100644
--- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
+++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
@@ -42,8 +42,6 @@
<script path='vif-bridge'/>
<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>
diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.xml
b/tests/xlconfigdata/test-fullvirt-multiusb.xml
index 0e6d0b6..3f868c9 100644
--- a/tests/xlconfigdata/test-fullvirt-multiusb.xml
+++ b/tests/xlconfigdata/test-fullvirt-multiusb.xml
@@ -41,8 +41,6 @@
</interface>
<input type='mouse' bus='usb'/>
<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>
diff --git a/tests/xlconfigdata/test-new-disk.xml b/tests/xlconfigdata/test-new-disk.xml
index 718a2da..b4e6af2 100644
--- a/tests/xlconfigdata/test-new-disk.xml
+++ b/tests/xlconfigdata/test-new-disk.xml
@@ -45,8 +45,6 @@
<script path='vif-bridge'/>
<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'>
<listen type='address' address='127.0.0.1'/>
</graphics>
diff --git a/tests/xlconfigdata/test-spice-features.xml
b/tests/xlconfigdata/test-spice-features.xml
index 3160c2b..9223a32 100644
--- a/tests/xlconfigdata/test-spice-features.xml
+++ b/tests/xlconfigdata/test-spice-features.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<model type='e1000'/>
</interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='spice' port='590' tlsPort='500'
autoport='no' listen='127.0.0.1' passwd='thebeast'>
<listen type='address' address='127.0.0.1'/>
<mouse mode='client'/>
diff --git a/tests/xlconfigdata/test-spice.xml b/tests/xlconfigdata/test-spice.xml
index 30415fb..f0a0f15 100644
--- a/tests/xlconfigdata/test-spice.xml
+++ b/tests/xlconfigdata/test-spice.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<model type='e1000'/>
</interface>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='spice' port='590' tlsPort='500'
autoport='no' listen='127.0.0.1' passwd='thebeast'>
<listen type='address' address='127.0.0.1'/>
<mouse mode='server'/>
diff --git a/tests/xmconfigdata/test-escape-paths.xml
b/tests/xmconfigdata/test-escape-paths.xml
index d2ec843..73fcd88 100644
--- a/tests/xmconfigdata/test-escape-paths.xml
+++ b/tests/xmconfigdata/test-escape-paths.xml
@@ -45,8 +45,6 @@
<script path='vif-bridge'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml
b/tests/xmconfigdata/test-fullvirt-default-feature.xml
index 06ad44e..2b79c64 100644
--- a/tests/xmconfigdata/test-fullvirt-default-feature.xml
+++ b/tests/xmconfigdata/test-fullvirt-default-feature.xml
@@ -41,8 +41,6 @@
<script path='vif-bridge'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml
b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
index 06ad44e..2b79c64 100644
--- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml
+++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
@@ -41,8 +41,6 @@
<script path='vif-bridge'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
index 148c372..cb340e0 100644
--- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
+++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
@@ -41,8 +41,6 @@
<script path='vif-bridge'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml
b/tests/xmconfigdata/test-fullvirt-localtime.xml
index 5db392c..c393fb6 100644
--- a/tests/xmconfigdata/test-fullvirt-localtime.xml
+++ b/tests/xmconfigdata/test-fullvirt-localtime.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-net-ioemu.xml
b/tests/xmconfigdata/test-fullvirt-net-ioemu.xml
index ad15dde..6e69847 100644
--- a/tests/xmconfigdata/test-fullvirt-net-ioemu.xml
+++ b/tests/xmconfigdata/test-fullvirt-net-ioemu.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml
b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
index 4d23802..0e73087 100644
--- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml
+++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
index ad15dde..6e69847 100644
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
index dd5fd3f..38e4e1a 100644
--- a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
+++ b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
index a2897f1..2aeeeb5 100644
--- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
@@ -44,8 +44,6 @@
<protocol type='raw'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
index 5cbca37..0d29e79 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
@@ -51,8 +51,6 @@
<source path='/dev/ttyS0'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
index 27c29c6..1d75025 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
@@ -47,8 +47,6 @@
<source path='/dev/ttyS1'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml
b/tests/xmconfigdata/test-fullvirt-serial-file.xml
index 092c062..b2adeab 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-file.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml
@@ -47,8 +47,6 @@
<source path='/tmp/serial.log'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml
b/tests/xmconfigdata/test-fullvirt-serial-null.xml
index a1394d9..a6d8afd 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-null.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml
@@ -45,8 +45,6 @@
<console type='null'>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
index 321d309..3f09856 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
@@ -47,8 +47,6 @@
<source path='/tmp/serial.pipe'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml
b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
index 05c82fe..f3c4c46 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
@@ -45,8 +45,6 @@
<console type='pty'>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
index c6c702c..af662d1 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
@@ -45,8 +45,6 @@
<console type='stdio'>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
index 72c169e..a0f5be1 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
@@ -49,8 +49,6 @@
<protocol type='telnet'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
index ab179ec..17ba832 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
@@ -49,8 +49,6 @@
<protocol type='raw'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml
b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
index 8c8d19a..884e7b9 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
@@ -49,8 +49,6 @@
<source mode='connect' host='127.0.0.1'
service='9999'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml
b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
index 0e25cac..ebc7836 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
@@ -47,8 +47,6 @@
<source mode='bind' path='/tmp/serial.sock'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml
b/tests/xmconfigdata/test-fullvirt-sound.xml
index 25364eb..cd066cd 100644
--- a/tests/xmconfigdata/test-fullvirt-sound.xml
+++ b/tests/xmconfigdata/test-fullvirt-sound.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<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>
diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml
b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
index c7526ae..a2abfde 100644
--- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
@@ -40,8 +40,6 @@
<model type='e1000'/>
</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>
diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
index 23535eb..8c89f98 100644
--- a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
@@ -39,7 +39,6 @@
<script path='vif-bridge'/>
</interface>
<input type='tablet'/>
- <input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' listen='127.0.0.1'
passwd='123poi'>
<listen type='address' address='127.0.0.1'/>
</graphics>
diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml
b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
index aa16eb1..062fd52 100644
--- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
@@ -40,8 +40,6 @@
<model type='e1000'/>
</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>
diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml
b/tests/xmconfigdata/test-fullvirt-utc.xml
index ad15dde..6e69847 100644
--- a/tests/xmconfigdata/test-fullvirt-utc.xml
+++ b/tests/xmconfigdata/test-fullvirt-utc.xml
@@ -39,8 +39,6 @@
<script path='vif-bridge'/>
<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>
diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml
b/tests/xmconfigdata/test-no-source-cdrom.xml
index a0952e8..85636ea 100644
--- a/tests/xmconfigdata/test-no-source-cdrom.xml
+++ b/tests/xmconfigdata/test-no-source-cdrom.xml
@@ -44,8 +44,6 @@
<console type='pty'>
<target type='serial' port='0'/>
</console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<memballoon model='xen'/>
</devices>
diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml
b/tests/xmconfigdata/test-paravirt-net-e1000.xml
index 0db020f..cc8faa6 100644
--- a/tests/xmconfigdata/test-paravirt-net-e1000.xml
+++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml
@@ -27,8 +27,6 @@
<console type='pty'>
<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>
diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.xml
b/tests/xmconfigdata/test-paravirt-net-vifname.xml
index ff17aee..afffb51 100644
--- a/tests/xmconfigdata/test-paravirt-net-vifname.xml
+++ b/tests/xmconfigdata/test-paravirt-net-vifname.xml
@@ -28,8 +28,6 @@
<console type='pty'>
<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>
diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
index ce7bfb9..92bfe45 100644
--- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
@@ -26,8 +26,6 @@
<console type='pty'>
<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>
diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml
b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
index cba6dff..a2437b2 100644
--- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
@@ -26,8 +26,6 @@
<console type='pty'>
<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>
diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
index ce7bfb9..92bfe45 100644
--- a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
+++ b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
@@ -26,8 +26,6 @@
<console type='pty'>
<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>
diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.xml
b/tests/xmconfigdata/test-paravirt-old-pvfb.xml
index cba6dff..a2437b2 100644
--- a/tests/xmconfigdata/test-paravirt-old-pvfb.xml
+++ b/tests/xmconfigdata/test-paravirt-old-pvfb.xml
@@ -26,8 +26,6 @@
<console type='pty'>
<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>
diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml
index bdb1e82..5cde070 100644
--- a/tests/xmconfigdata/test-pci-devs.xml
+++ b/tests/xmconfigdata/test-pci-devs.xml
@@ -44,8 +44,6 @@
<console type='pty'>
<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>
--
2.6.3