Commit 6f2b9a5b authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

virtio-input: move properties, use virtio_instance_init_common 



Move properties from virtio-*-pci to virtio-*-device.
Also make better use of QOM and attach common properties
to the abstract parent classes (virtio-input-device and
virtio-input-pci-device).

Switch the hid device instance init functions over to use
virtio_instance_init_common, so we get the properties of the
virtio device aliased properly to the virtio pci proxy.

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

hw/input/virtio-input.c

+7 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static void virtio_input_device_realize(DeviceState *dev, Error **errp) 
    }



    virtio_input_idstr_config(vinput, VIRTIO_INPUT_CFG_ID_SERIAL,

                              vinput->input.serial);

                              vinput->serial);



    QTAILQ_FOREACH(cfg, &vinput->cfg_list, node) {

        if (vinput->cfg_size < cfg->config.size) {
@@ -248,11 +248,17 @@ static void virtio_input_device_unrealize(DeviceState *dev, Error **errp) 
    virtio_cleanup(vdev);

}



static Property virtio_input_properties[] = {

    DEFINE_PROP_STRING("serial", VirtIOInput, serial),

    DEFINE_PROP_END_OF_LIST(),

};



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

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);



    dc->props          = virtio_input_properties;

    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

    vdc->realize      = virtio_input_device_realize;

    vdc->unrealize    = virtio_input_device_unrealize;

hw/virtio/virtio-pci.c

+11 −16
Original line number Diff line number Diff line
@@ -1900,8 +1900,7 @@ static const TypeInfo virtio_rng_pci_info = { 


/* virtio-input-pci */



static Property virtio_input_hid_pci_properties[] = {

    DEFINE_VIRTIO_INPUT_PROPERTIES(VirtIOInputPCI, vdev.input),

static Property virtio_input_pci_properties[] = {

    DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),

    DEFINE_PROP_END_OF_LIST(),

};
@@ -1924,19 +1923,13 @@ static void virtio_input_pci_class_init(ObjectClass *klass, void *data) 
    VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);

    PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);



    dc->props = virtio_input_pci_properties;

    k->realize = virtio_input_pci_realize;

    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);



    pcidev_k->class_id = PCI_CLASS_INPUT_OTHER;

}



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

{

    DeviceClass *dc = DEVICE_CLASS(klass);



    dc->props = virtio_input_hid_pci_properties;

}



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

{

    PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);
@@ -1955,22 +1948,25 @@ static void virtio_input_hid_mouse_pci_class_init(ObjectClass *klass, 
static void virtio_keyboard_initfn(Object *obj)

{

    VirtIOInputHIDPCI *dev = VIRTIO_INPUT_HID_PCI(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_KEYBOARD);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_KEYBOARD);

}



static void virtio_mouse_initfn(Object *obj)

{

    VirtIOInputHIDPCI *dev = VIRTIO_INPUT_HID_PCI(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_MOUSE);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_MOUSE);

}



static void virtio_tablet_initfn(Object *obj)

{

    VirtIOInputHIDPCI *dev = VIRTIO_INPUT_HID_PCI(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_TABLET);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_TABLET);

}



static const TypeInfo virtio_input_pci_info = {
@@ -1985,7 +1981,6 @@ static const TypeInfo virtio_input_hid_pci_info = { 
    .name          = TYPE_VIRTIO_INPUT_HID_PCI,

    .parent        = TYPE_VIRTIO_INPUT_PCI,

    .instance_size = sizeof(VirtIOInputHIDPCI),

    .class_init    = virtio_input_hid_pci_class_init,

    .abstract      = true,

};

include/hw/virtio/virtio-input.h

+1 −8
Original line number Diff line number Diff line
@@ -50,18 +50,11 @@ typedef struct virtio_input_event virtio_input_event; 
#define VIRTIO_INPUT_HID_GET_PARENT_CLASS(obj) \

        OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_INPUT_HID)



#define DEFINE_VIRTIO_INPUT_PROPERTIES(_state, _field)       \

        DEFINE_PROP_STRING("serial", _state, _field.serial)



typedef struct VirtIOInput VirtIOInput;

typedef struct VirtIOInputClass VirtIOInputClass;

typedef struct VirtIOInputConfig VirtIOInputConfig;

typedef struct VirtIOInputHID VirtIOInputHID;



struct virtio_input_conf {

    char *serial;

};



struct VirtIOInputConfig {

    virtio_input_config               config;

    QTAILQ_ENTRY(VirtIOInputConfig)   node;
@@ -74,7 +67,7 @@ struct VirtIOInput { 
    uint32_t                          cfg_size;

    QTAILQ_HEAD(, VirtIOInputConfig)  cfg_list;

    VirtQueue                         *evt, *sts;

    virtio_input_conf                 input;

    char                              *serial;



    virtio_input_event                *queue;

    uint32_t                          qindex, qsize;