diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0e0490e8f623f374beafeb1e8122c518c5aaf56e..df54ad3d02ed17934c1e35a0276f31878f111f66 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4801,6 +4801,9 @@ qemu-kvm -net nic,model=? /dev/null <devices> <input type='mouse' bus='usb'/> <input type='keyboard' bus='usb'/> + <input type='mouse' bus='virtio'/> + <input type='keyboard' bus='virtio'/> + <input type='tablet' bus='virtio'/> </devices> ... @@ -4812,7 +4815,8 @@ qemu-kvm -net nic,model=? /dev/null The tablet provides absolute cursor movement, while the mouse uses relative movement. The optional bus attribute can be used to refine the exact device type. - It takes values "xen" (paravirtualized), "ps2" and "usb". + It takes values "xen" (paravirtualized), "ps2" and "usb" or + (since 1.3.0) "virtio".

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 284a7e4d6eade1184214a9130a697a207c80135b..6d71199b17c23a6e22830d92749b049b174dcef6 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3592,6 +3592,7 @@ ps2 usb xen + virtio diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cbfc41e5ff4d152150c3d77800a69c7f1cdcd665..12b3769ce99f370fa6a0ed99a53be91200da5037 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -550,7 +550,8 @@ VIR_ENUM_IMPL(virDomainInputBus, VIR_DOMAIN_INPUT_BUS_LAST, "ps2", "usb", "xen", - "parallels") + "parallels", + "virtio") VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, "sdl", @@ -22399,7 +22400,8 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto error; for (n = 0; n < def->ninputs; n++) - if (def->inputs[n]->bus == VIR_DOMAIN_INPUT_BUS_USB && + 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) goto error; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c2b7602ac880dc2eefb977a6a08ebbd0367de871..6d2ca55b851d70af5405797b074a68b72e927492 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1297,6 +1297,7 @@ typedef enum { VIR_DOMAIN_INPUT_BUS_USB, VIR_DOMAIN_INPUT_BUS_XEN, VIR_DOMAIN_INPUT_BUS_PARALLELS, /* pseudo device for VNC in containers */ + VIR_DOMAIN_INPUT_BUS_VIRTIO, VIR_DOMAIN_INPUT_BUS_LAST } virDomainInputBus; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-input.xml b/tests/qemuxml2argvdata/qemuxml2argv-virtio-input.xml new file mode 100644 index 0000000000000000000000000000000000000000..11fb5666ee22bf92cacaa8b994a0fa26f20badc0 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-input.xml @@ -0,0 +1,26 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + +

+ + + + + diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index cabec61478e5d73d870997006c64dbc9d66842fb..4b2cff7aaf0db8ed7c2ba9d19f0593913b412569 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -632,6 +632,7 @@ mymain(void) DO_TEST("video-virtio-gpu-device"); DO_TEST("video-virtio-gpu-virgl"); + DO_TEST("virtio-input"); qemuTestDriverFree(&driver);