Signed-off-by: Kristina Hanicova <khanicov@redhat.com> --- docs/formatdomain.rst | 37 ++++++++----- docs/schemas/domaincommon.rng | 20 +++++++ src/conf/domain_audit.c | 1 + src/conf/domain_conf.c | 66 ++++++++++++++++++++---- src/conf/domain_conf.h | 12 +++++ src/conf/domain_validate.c | 8 +++ src/libvirt_private.syms | 2 + src/qemu/qemu_cgroup.c | 2 + src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain_address.c | 1 + src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_validate.c | 6 +++ src/security/security_apparmor.c | 1 + src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + src/security/virt-aa-helper.c | 3 +- tests/qemuxml2argvdata/input-linux.xml | 24 +++++++++ tests/qemuxml2xmloutdata/input-linux.xml | 1 + 18 files changed, 167 insertions(+), 23 deletions(-) create mode 100644 tests/qemuxml2argvdata/input-linux.xml create mode 120000 tests/qemuxml2xmloutdata/input-linux.xml diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index fa5c14febc..e115165ad2 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -5728,26 +5728,37 @@ to provide a graphics tablet for absolute cursor movement. <input type='passthrough' bus='virtio'> <source evdev='/dev/input/event1'/> </input> + <input type='evdev'> + <source dev='/dev/input/event1234' grab='all' repeat='on'/> + </input> </devices> ... ``input`` The ``input`` element has one mandatory attribute, the ``type`` whose value - can be 'mouse', 'tablet', ( :since:`since 1.2.2` ) 'keyboard' or ( - :since:`since 1.3.0` ) 'passthrough'. 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" or ( :since:`since 1.3.0` ) "virtio". + can be 'mouse', 'tablet', ( :since:`since 1.2.2` ) 'keyboard', ( + :since:`since 1.3.0` ) 'passthrough' or ( :since:`since 7.4.0` ) 'evdev'. + 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" or ( + :since:`since 1.3.0` ) "virtio". The ``input`` element has an optional sub-element ``<address>`` which can tie -the device to a particular PCI slot, `documented above <#elementsAddress>`__. On -S390, ``address`` can be used to provide a CCW address for an input device ( -:since:`since 4.2.0` ). For type ``passthrough``, the mandatory sub-element -``source`` must have an ``evdev`` attribute containing the absolute path to the -event device passed through to guests. (KVM only) :since:`Since 5.2.0` , the -``input`` element accepts a ``model`` attribute which has the values 'virtio', -'virtio-transitional' and 'virtio-non-transitional'. See `Virtio transitional -devices <#elementsVirtioTransitional>`__ for more details. +the device to a particular PCI slot, `documented above <#elementsAddress>`__. +On S390, ``address`` can be used to provide a CCW address for an input device ( +:since:`since 4.2.0` ). For types ``passthrough`` and ``evdev``, the mandatory +sub-element ``source`` must have an ``evdev`` (for ``passthrough``) or ``dev`` +(for ``evdev``) attribute containing the absolute path to the event device +passed through to guests. +For type ``evdev``, ``source`` can have two optional attributes ``grab`` with +value 'all' which when enabled grabs all input devices instead of just one and +``repeat`` with value 'on'/'off' to enable/disable auto-repeat events ( +:since:`Since 7.4.0`). +``input`` type ``evdev`` is currently supported only on linux devices. +(KVM only) :since:`Since 5.2.0` , the ``input`` element accepts a +``model`` attribute which has the values 'virtio', 'virtio-transitional' and +'virtio-non-transitional'. See `Virtio transitional devices +<#elementsVirtioTransitional>`__ for more details. The subelement ``driver`` can be used to tune the virtio options of the device: `Virtio-specific options <#elementsVirtio>`__ can also be set. ( :since:`Since diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index a2e5c50c1d..16e1c549c2 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -5443,6 +5443,26 @@ </attribute> </element> </group> + <group> + <attribute name="type"> + <value>evdev</value> + </attribute> + <element name="source"> + <attribute name="dev"> + <ref name="absFilePath"/> + </attribute> + <optional> + <attribute name="grab"> + <value>all</value> + </attribute> + </optional> + <optional> + <attribute name="repeat"> + <ref name="virOnOff"/> + </attribute> + </optional> + </element> + </group> </choice> <optional> <attribute name="model"> diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index b1226fd5dc..b08233fa49 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -956,6 +956,7 @@ virDomainAuditInput(virDomainObj *vm, break; case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: + case VIR_DOMAIN_INPUT_TYPE_EVDEV: VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, "virt=%s resrc=evdev reason=%s %s uuid=%s path=%s", virt, reason, vmname, uuidstr, VIR_AUDIT_STR(input->source.evdev)); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e8632e4d73..299b600e24 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -864,6 +864,7 @@ VIR_ENUM_IMPL(virDomainInput, "tablet", "keyboard", "passthrough", + "evdev", ); VIR_ENUM_IMPL(virDomainInputBus, @@ -873,6 +874,7 @@ VIR_ENUM_IMPL(virDomainInputBus, "xen", "parallels", "virtio", + "none", ); VIR_ENUM_IMPL(virDomainInputModel, @@ -883,6 +885,12 @@ VIR_ENUM_IMPL(virDomainInputModel, "virtio-non-transitional", ); +VIR_ENUM_IMPL(virDomainInputSourceGrab, + VIR_DOMAIN_INPUT_SOURCE_GRAB_LAST, + "default", + "all", +); + VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, "sdl", @@ -1879,6 +1887,7 @@ const char *virDomainInputDefGetPath(virDomainInputDef *input) return NULL; case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: + case VIR_DOMAIN_INPUT_TYPE_EVDEV: return input->source.evdev; } return NULL; @@ -11892,10 +11901,10 @@ virDomainInputDefParseXML(virDomainXMLOption *xmlopt, { VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainInputDef *def; - g_autofree char *evdev = NULL; g_autofree char *type = NULL; g_autofree char *bus = NULL; g_autofree char *model = NULL; + xmlNodePtr source = NULL; def = g_new0(virDomainInputDef, 1); @@ -11997,6 +12006,8 @@ virDomainInputDefParseXML(virDomainXMLOption *xmlopt, } else if (ARCH_IS_S390(dom->os.arch) || def->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH) { def->bus = VIR_DOMAIN_INPUT_BUS_VIRTIO; + } else if (def->type == VIR_DOMAIN_INPUT_TYPE_EVDEV) { + def->bus = VIR_DOMAIN_INPUT_BUS_NONE; } else { def->bus = VIR_DOMAIN_INPUT_BUS_USB; } @@ -12021,12 +12032,36 @@ virDomainInputDefParseXML(virDomainXMLOption *xmlopt, goto error; } - if ((evdev = virXPathString("string(./source/@evdev)", ctxt))) - def->source.evdev = virFileSanitizePath(evdev); - if (def->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH && !def->source.evdev) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Missing evdev path for input device passthrough")); - goto error; + if ((source = virXPathNode("./source", ctxt))) { + g_autofree char *evdev = NULL; + + if (def->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH) + evdev = virXMLPropString(source, "evdev"); + else if (def->type == VIR_DOMAIN_INPUT_TYPE_EVDEV) + evdev = virXMLPropString(source, "dev"); + + if (evdev) + def->source.evdev = virFileSanitizePath(evdev); + + if (def->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH || + def->type == VIR_DOMAIN_INPUT_TYPE_EVDEV) { + if (!def->source.evdev) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Missing evdev path for input device")); + goto error; + } + } + + if (def->type == VIR_DOMAIN_INPUT_TYPE_EVDEV) { + if (virXMLPropEnum(source, "grab", + virDomainInputSourceGrabTypeFromString, + VIR_XML_PROP_NONZERO, &def->source.grab) < 0) + goto error; + + if (virXMLPropTristateSwitch(source, "repeat", + VIR_XML_PROP_NONE, &def->source.repeat) < 0) + goto error; + } } if (virDomainVirtioOptionsParseXML(virXPathNode("./driver", ctxt), @@ -26076,9 +26111,12 @@ virDomainInputDefFormat(virBuffer *buf, { const char *type = virDomainInputTypeToString(def->type); const char *bus = virDomainInputBusTypeToString(def->bus); + const char *grab = virDomainInputSourceGrabTypeToString(def->source.grab); + const char *repeat = virTristateSwitchTypeToString(def->source.repeat); g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); g_auto(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) sourceAttrBuf = VIR_BUFFER_INITIALIZER; /* don't format keyboard into migratable XML for backward compatibility */ if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && @@ -26098,7 +26136,9 @@ virDomainInputDefFormat(virBuffer *buf, return -1; } - virBufferAsprintf(&attrBuf, " type='%s' bus='%s'", type, bus); + virBufferAsprintf(&attrBuf, " type='%s'", type); + if (def->bus != VIR_DOMAIN_INPUT_BUS_NONE) + virBufferAsprintf(&attrBuf, " bus='%s'", bus); if (def->model) { const char *model = virDomainInputModelTypeToString(def->model); @@ -26116,7 +26156,15 @@ virDomainInputDefFormat(virBuffer *buf, virXMLFormatElement(&childBuf, "driver", &driverAttrBuf, NULL); - virBufferEscapeString(&childBuf, "<source evdev='%s'/>\n", def->source.evdev); + virBufferEscapeString(&sourceAttrBuf, " evdev='%s'", def->source.evdev); + + if (def->source.grab) + virBufferAsprintf(&sourceAttrBuf, " grab='%s'", grab); + if (def->source.repeat) + virBufferAsprintf(&sourceAttrBuf, " repeat='%s'", repeat); + + virXMLFormatElement(&childBuf, "source", &sourceAttrBuf, NULL); + virDomainDeviceInfoFormat(&childBuf, &def->info, flags); virXMLFormatElement(buf, "input", &attrBuf, &childBuf); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 2d5462bb55..ffd914e701 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1388,6 +1388,7 @@ typedef enum { VIR_DOMAIN_INPUT_TYPE_TABLET, VIR_DOMAIN_INPUT_TYPE_KBD, VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH, + VIR_DOMAIN_INPUT_TYPE_EVDEV, VIR_DOMAIN_INPUT_TYPE_LAST } virDomainInputType; @@ -1398,6 +1399,7 @@ typedef enum { 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_NONE, VIR_DOMAIN_INPUT_BUS_LAST } virDomainInputBus; @@ -1411,12 +1413,21 @@ typedef enum { VIR_DOMAIN_INPUT_MODEL_LAST } virDomainInputModel; +typedef enum { + VIR_DOMAIN_INPUT_SOURCE_GRAB_DEFAULT, + VIR_DOMAIN_INPUT_SOURCE_GRAB_ALL, + + VIR_DOMAIN_INPUT_SOURCE_GRAB_LAST +} virDomainInputSourceGrab; + struct _virDomainInputDef { int type; int bus; int model; /* virDomainInputModel */ struct { char *evdev; + virDomainInputSourceGrab grab; + virTristateSwitch repeat; } source; virDomainDeviceInfo info; virDomainVirtioOptions *virtio; @@ -3845,6 +3856,7 @@ VIR_ENUM_DECL(virDomainRedirdevBus); VIR_ENUM_DECL(virDomainInput); VIR_ENUM_DECL(virDomainInputBus); VIR_ENUM_DECL(virDomainInputModel); +VIR_ENUM_DECL(virDomainInputSourceGrab); VIR_ENUM_DECL(virDomainGraphics); VIR_ENUM_DECL(virDomainGraphicsListen); VIR_ENUM_DECL(virDomainGraphicsAuthConnected); diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 686b9e8d16..98202a3adc 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1961,6 +1961,14 @@ virDomainInputDefValidate(const virDomainInputDef *input) } break; + case VIR_DOMAIN_INPUT_TYPE_EVDEV: + if (input->bus != VIR_DOMAIN_INPUT_BUS_NONE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("input evdev doesn't support bus element")); + return -1; + } + break; + case VIR_DOMAIN_INPUT_TYPE_LAST: default: virReportEnumRangeError(virDomainInputType, input->type); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1b12c49018..e0c3caa460 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -475,6 +475,8 @@ virDomainInputBusTypeToString; virDomainInputDefFind; virDomainInputDefFree; virDomainInputDefGetPath; +virDomainInputSourceGrabTypeFromString; +virDomainInputSourceGrabTypeToString; virDomainInputTypeToString; virDomainIOMMUModelTypeFromString; virDomainIOMMUModelTypeToString; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 0e8835fb86..038d6478b2 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -362,6 +362,7 @@ qemuSetupInputCgroup(virDomainObj *vm, switch (dev->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: + case VIR_DOMAIN_INPUT_TYPE_EVDEV: VIR_DEBUG("Process path '%s' for input device", dev->source.evdev); ret = virCgroupAllowDevicePath(priv->cgroup, dev->source.evdev, VIR_CGROUP_DEVICE_RW, false); @@ -385,6 +386,7 @@ qemuTeardownInputCgroup(virDomainObj *vm, switch (dev->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: + case VIR_DOMAIN_INPUT_TYPE_EVDEV: VIR_DEBUG("Process path '%s' for input device", dev->source.evdev); ret = virCgroupDenyDevicePath(priv->cgroup, dev->source.evdev, VIR_CGROUP_DEVICE_RWM, false); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d6c5308ef0..41f0b1d1d5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4017,6 +4017,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, return NULL; } break; + case VIR_DOMAIN_INPUT_TYPE_EVDEV: case VIR_DOMAIN_INPUT_TYPE_LAST: default: virReportEnumRangeError(virDomainInputType, dev->type); diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index a11e40d9b2..10cf5eb6f4 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -973,6 +973,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev, case VIR_DOMAIN_INPUT_BUS_USB: case VIR_DOMAIN_INPUT_BUS_XEN: case VIR_DOMAIN_INPUT_BUS_PARALLELS: + case VIR_DOMAIN_INPUT_BUS_NONE: case VIR_DOMAIN_INPUT_BUS_LAST: return 0; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a64cddb9e7..c6f275e11d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5805,6 +5805,7 @@ qemuDomainDetachPrepInput(virDomainObj *vm, case VIR_DOMAIN_INPUT_BUS_LAST: case VIR_DOMAIN_INPUT_BUS_USB: case VIR_DOMAIN_INPUT_BUS_VIRTIO: + case VIR_DOMAIN_INPUT_BUS_NONE: break; } diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 141203f979..07320c9045 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4563,6 +4563,7 @@ qemuValidateDomainDeviceDefInput(const virDomainInputDef *input, case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: + case VIR_DOMAIN_INPUT_TYPE_EVDEV: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("virtio (non-)transitional models are not " "supported for input type=%s"), @@ -4608,6 +4609,11 @@ qemuValidateDomainDeviceDefInput(const virDomainInputDef *input, cap = QEMU_CAPS_VIRTIO_INPUT_HOST; ccwCap = QEMU_CAPS_LAST; break; + case VIR_DOMAIN_INPUT_TYPE_EVDEV: + baseName = "input-linux"; + cap = QEMU_CAPS_INPUT_LINUX; + ccwCap = QEMU_CAPS_LAST; + break; case VIR_DOMAIN_INPUT_TYPE_LAST: default: virReportEnumRangeError(virDomainInputType, diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index a2a8435fe4..84363015dc 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -720,6 +720,7 @@ AppArmorSetInputLabel(virSecurityManager *mgr, switch ((virDomainInputType)input->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: + case VIR_DOMAIN_INPUT_TYPE_EVDEV: if (input->source.evdev == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: passthrough input device has no source"), diff --git a/src/security/security_dac.c b/src/security/security_dac.c index e973964735..76bfce7762 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1815,6 +1815,7 @@ virSecurityDACSetInputLabel(virSecurityManager *mgr, switch ((virDomainInputType)input->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: + case VIR_DOMAIN_INPUT_TYPE_EVDEV: if (virSecurityDACGetIds(seclabel, priv, &user, &group, NULL, NULL) < 0) return -1; @@ -1843,6 +1844,7 @@ virSecurityDACRestoreInputLabel(virSecurityManager *mgr, switch ((virDomainInputType)input->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: + case VIR_DOMAIN_INPUT_TYPE_EVDEV: ret = virSecurityDACRestoreFileLabel(mgr, input->source.evdev); break; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 29628d8953..b50f4463cc 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1513,6 +1513,7 @@ virSecuritySELinuxSetInputLabel(virSecurityManager *mgr, switch ((virDomainInputType)input->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: + case VIR_DOMAIN_INPUT_TYPE_EVDEV: if (virSecuritySELinuxSetFilecon(mgr, input->source.evdev, seclabel->imagelabel, true) < 0) return -1; @@ -1543,6 +1544,7 @@ virSecuritySELinuxRestoreInputLabel(virSecurityManager *mgr, switch ((virDomainInputType)input->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: + case VIR_DOMAIN_INPUT_TYPE_EVDEV: rc = virSecuritySELinuxRestoreFileLabel(mgr, input->source.evdev, true); break; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index e0d78ae309..52cfebf6e0 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1149,7 +1149,8 @@ get_files(vahControl * ctl) for (i = 0; i < ctl->def->ninputs; i++) { if (ctl->def->inputs[i] && - ctl->def->inputs[i]->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH) { + (ctl->def->inputs[i]->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH || + ctl->def->inputs[i]->type == VIR_DOMAIN_INPUT_TYPE_EVDEV)) { if (vah_add_file(&buf, ctl->def->inputs[i]->source.evdev, "rw") != 0) goto cleanup; } diff --git a/tests/qemuxml2argvdata/input-linux.xml b/tests/qemuxml2argvdata/input-linux.xml new file mode 100644 index 0000000000..056bb3f3f9 --- /dev/null +++ b/tests/qemuxml2argvdata/input-linux.xml @@ -0,0 +1,24 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i386</emulator> + <controller type='pci' index='0' model='pci-root'/> + <input type='evdev'> + <source dev='/dev/input/event1234' grab='all' repeat='on'/> + </input> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/input-linux.xml b/tests/qemuxml2xmloutdata/input-linux.xml new file mode 120000 index 0000000000..84e1e79b51 --- /dev/null +++ b/tests/qemuxml2xmloutdata/input-linux.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/input-linux.xml \ No newline at end of file -- 2.31.1

Resolves: https://gitlab.com/libvirt/libvirt/-/issues/142 Signed-off-by: Kristina Hanicova <khanicov@redhat.com> --- src/qemu/qemu_command.c | 32 ++++++++++++++++- .../input-linux.x86_64-latest.args | 34 +++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/input-linux.x86_64-latest.args diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 41f0b1d1d5..a1354d6fbd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4065,6 +4065,29 @@ qemuBuildUSBInputDevStr(const virDomainDef *def, } +static char * +qemuBuildObjectInputDevStr(virDomainInputDef *dev, + virQEMUCaps *qemuCaps) +{ + g_autoptr(virJSONValue) props = NULL; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; + + if (qemuMonitorCreateObjectProps(&props, "input-linux", dev->info.alias, + "s:evdev", dev->source.evdev, + "T:repeat", dev->source.repeat, + NULL) < 0) + return NULL; + + if (dev->source.grab == VIR_DOMAIN_INPUT_SOURCE_GRAB_ALL) + virJSONValueObjectAdd(props, "b:grab_all", true, NULL); + + if (qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps) < 0) + return NULL; + + return virBufferContentAndReset(&buf); +} + + int qemuBuildInputDevStr(char **devstr, const virDomainDef *def, @@ -4081,6 +4104,10 @@ qemuBuildInputDevStr(char **devstr, if (!(*devstr = qemuBuildVirtioInputDevStr(def, input, qemuCaps))) return -1; break; + case VIR_DOMAIN_INPUT_BUS_NONE: + if (!(*devstr = qemuBuildObjectInputDevStr(input, qemuCaps))) + return -1; + break; } return 0; } @@ -4104,7 +4131,10 @@ qemuBuildInputCommandLine(virCommand *cmd, return -1; if (devstr) { - virCommandAddArg(cmd, "-device"); + if (input->type == VIR_DOMAIN_INPUT_TYPE_EVDEV) + virCommandAddArg(cmd, "-object"); + else + virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, devstr); } } diff --git a/tests/qemuxml2argvdata/input-linux.x86_64-latest.args b/tests/qemuxml2argvdata/input-linux.x86_64-latest.args new file mode 100644 index 0000000000..688cf02873 --- /dev/null +++ b/tests/qemuxml2argvdata/input-linux.x86_64-latest.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-object '{"qom-type":"input-linux","id":"input0","evdev":"/dev/input/event1234","repeat":true,"grab_all":true}' \ +-audiodev id=audio1,driver=none \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a9dafe226e..265427ab7b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3259,6 +3259,8 @@ mymain(void) QEMU_CAPS_VIRTIO_MOUSE, QEMU_CAPS_VIRTIO_TABLET); DO_TEST("virtio-input-passthrough", QEMU_CAPS_VIRTIO_INPUT_HOST); + DO_TEST_CAPS_LATEST("input-linux"); + DO_TEST("ppc64-usb-controller", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_PCI_OHCI); -- 2.31.1