Commit 9c4d05b7 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Gerd Hoffmann
Browse files

Add vhost-user-input-pci 



Add a new virtio-input device, which connects to a vhost-user
backend.

Instead of reading configuration directly from an input device /
evdev (like virtio-input-host), it reads it over vhost-user protocol
with {SET,GET}_CONFIG messages. The vhost-user-backend handles the
queues & events setup.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20190503130034.24916-5-marcandre.lureau@redhat.com

[ kraxel: drop -{non-,}transitional variants ]
[ kraxel: fix "make check" on !linux ]

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent f24bb728

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1521,6 +1521,7 @@ L: qemu-s390x@nongnu.org 
virtio-input

M: Gerd Hoffmann <kraxel@redhat.com>

S: Maintained

F: hw/input/vhost-user-input.c

F: hw/input/virtio-input*.c

F: include/hw/virtio/virtio-input.h

hw/input/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -29,5 +29,10 @@ config VIRTIO_INPUT_HOST 
    default y

    depends on VIRTIO && LINUX



config VHOST_USER_INPUT

    bool

    default y

    depends on VIRTIO_INPUT && VHOST_USER



config TSC210X

    bool

hw/input/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-hid.o 
ifeq ($(CONFIG_LINUX),y)

common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-host.o

endif

common-obj-$(CONFIG_VHOST_USER_INPUT) += vhost-user-input.o



obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o

obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o

hw/input/vhost-user-input.c

0 → 100644
+129 −0
Original line number Diff line number Diff line 
/*

 * This work is licensed under the terms of the GNU GPL, version 2 or

 * (at your option) any later version.  See the COPYING file in the

 * top-level directory.

 */



#include "qemu/osdep.h"

#include "qemu/error-report.h"

#include "qapi/error.h"

#include "qemu-common.h"



#include "hw/qdev.h"

#include "hw/virtio/virtio-input.h"



static int vhost_input_config_change(struct vhost_dev *dev)

{

    error_report("vhost-user-input: unhandled backend config change");

    return -1;

}



static const VhostDevConfigOps config_ops = {

    .vhost_dev_config_notifier = vhost_input_config_change,

};



static void vhost_input_realize(DeviceState *dev, Error **errp)

{

    VHostUserInput *vhi = VHOST_USER_INPUT(dev);

    VirtIOInput *vinput = VIRTIO_INPUT(dev);

    VirtIODevice *vdev = VIRTIO_DEVICE(dev);



    vhost_dev_set_config_notifier(&vhi->vhost->dev, &config_ops);

    vinput->cfg_size = sizeof_field(virtio_input_config, u);

    if (vhost_user_backend_dev_init(vhi->vhost, vdev, 2, errp) == -1) {

        return;

    }

}



static void vhost_input_change_active(VirtIOInput *vinput)

{

    VHostUserInput *vhi = VHOST_USER_INPUT(vinput);



    if (vinput->active) {

        vhost_user_backend_start(vhi->vhost);

    } else {

        vhost_user_backend_stop(vhi->vhost);

    }

}



static void vhost_input_get_config(VirtIODevice *vdev, uint8_t *config_data)

{

    VirtIOInput *vinput = VIRTIO_INPUT(vdev);

    VHostUserInput *vhi = VHOST_USER_INPUT(vdev);

    int ret;



    memset(config_data, 0, vinput->cfg_size);



    ret = vhost_dev_get_config(&vhi->vhost->dev, config_data, vinput->cfg_size);

    if (ret) {

        error_report("vhost-user-input: get device config space failed");

        return;

    }

}



static void vhost_input_set_config(VirtIODevice *vdev,

                                   const uint8_t *config_data)

{

    VHostUserInput *vhi = VHOST_USER_INPUT(vdev);

    int ret;



    ret = vhost_dev_set_config(&vhi->vhost->dev, config_data,

                               0, sizeof(virtio_input_config),

                               VHOST_SET_CONFIG_TYPE_MASTER);

    if (ret) {

        error_report("vhost-user-input: set device config space failed");

        return;

    }



    virtio_notify_config(vdev);

}



static const VMStateDescription vmstate_vhost_input = {

    .name = "vhost-user-input",

    .unmigratable = 1,

};



static void vhost_input_class_init(ObjectClass *klass, void *data)

{

    VirtIOInputClass *vic = VIRTIO_INPUT_CLASS(klass);

    VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);

    DeviceClass *dc = DEVICE_CLASS(klass);



    dc->vmsd = &vmstate_vhost_input;

    vdc->get_config = vhost_input_get_config;

    vdc->set_config = vhost_input_set_config;

    vic->realize = vhost_input_realize;

    vic->change_active = vhost_input_change_active;

}



static void vhost_input_init(Object *obj)

{

    VHostUserInput *vhi = VHOST_USER_INPUT(obj);



    vhi->vhost = VHOST_USER_BACKEND(object_new(TYPE_VHOST_USER_BACKEND));

    object_property_add_alias(obj, "chardev",

                              OBJECT(vhi->vhost), "chardev", &error_abort);

}



static void vhost_input_finalize(Object *obj)

{

    VHostUserInput *vhi = VHOST_USER_INPUT(obj);



    object_unref(OBJECT(vhi->vhost));

}



static const TypeInfo vhost_input_info = {

    .name          = TYPE_VHOST_USER_INPUT,

    .parent        = TYPE_VIRTIO_INPUT,

    .instance_size = sizeof(VHostUserInput),

    .instance_init = vhost_input_init,

    .instance_finalize = vhost_input_finalize,

    .class_init    = vhost_input_class_init,

};



static void vhost_input_register_types(void)

{

    type_register_static(&vhost_input_info);

}



type_init(vhost_input_register_types)

hw/virtio/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o 
ifeq ($(CONFIG_VIRTIO_PCI),y)

obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-pci.o

obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk-pci.o

obj-$(CONFIG_VHOST_USER_INPUT) += vhost-user-input-pci.o

obj-$(CONFIG_VHOST_USER_SCSI) += vhost-user-scsi-pci.o

obj-$(CONFIG_VHOST_SCSI) += vhost-scsi-pci.o

obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host-pci.o