Commit f958c8aa authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Michael S. Tsirkin
Browse files

virtio-input: core code & base class [pci] 



This patch adds the virtio-pci support bits for virtio-input-device.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent ffaa0503

hw/virtio/virtio-pci.c

+36 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "hw/virtio/virtio-serial.h"

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

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

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

#include "hw/pci/pci.h"

#include "qemu/error-report.h"

#include "hw/pci/msi.h"
@@ -1897,6 +1898,40 @@ static const TypeInfo virtio_rng_pci_info = { 
    .class_init    = virtio_rng_pci_class_init,

};



/* virtio-input-pci */



static void virtio_input_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)

{

    VirtIOInputPCI *vinput = VIRTIO_INPUT_PCI(vpci_dev);

    DeviceState *vdev = DEVICE(&vinput->vdev);



    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));

    /* force virtio-1.0 */

    vpci_dev->flags &= ~VIRTIO_PCI_FLAG_DISABLE_MODERN;

    vpci_dev->flags |= VIRTIO_PCI_FLAG_DISABLE_LEGACY;

    object_property_set_bool(OBJECT(vdev), true, "realized", errp);

}



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

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);

    PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);



    k->realize = virtio_input_pci_realize;

    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);



    pcidev_k->class_id = PCI_CLASS_INPUT_OTHER;

}



static const TypeInfo virtio_input_pci_info = {

    .name          = TYPE_VIRTIO_INPUT_PCI,

    .parent        = TYPE_VIRTIO_PCI,

    .instance_size = sizeof(VirtIOInputPCI),

    .class_init    = virtio_input_pci_class_init,

    .abstract      = true,

};



/* virtio-pci-bus */



static void virtio_pci_bus_new(VirtioBusState *bus, size_t bus_size,
@@ -1938,6 +1973,7 @@ static const TypeInfo virtio_pci_bus_info = { 
static void virtio_pci_register_types(void)

{

    type_register_static(&virtio_rng_pci_info);

    type_register_static(&virtio_input_pci_info);

    type_register_static(&virtio_pci_bus_info);

    type_register_static(&virtio_pci_info);

#ifdef CONFIG_VIRTFS

hw/virtio/virtio-pci.h

+14 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "hw/virtio/virtio-balloon.h"

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

#include "hw/virtio/virtio-9p.h"

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

#ifdef CONFIG_VIRTFS

#include "hw/9pfs/virtio-9p.h"

#endif
@@ -39,6 +40,7 @@ typedef struct VirtIOSerialPCI VirtIOSerialPCI; 
typedef struct VirtIONetPCI VirtIONetPCI;

typedef struct VHostSCSIPCI VHostSCSIPCI;

typedef struct VirtIORngPCI VirtIORngPCI;

typedef struct VirtIOInputPCI VirtIOInputPCI;



/* virtio-pci-bus */
@@ -234,6 +236,18 @@ struct VirtIORngPCI { 
    VirtIORNG vdev;

};



/*

 * virtio-input-pci: This extends VirtioPCIProxy.

 */

#define TYPE_VIRTIO_INPUT_PCI "virtio-input-pci"

#define VIRTIO_INPUT_PCI(obj) \

        OBJECT_CHECK(VirtIOInputPCI, (obj), TYPE_VIRTIO_INPUT_PCI)



struct VirtIOInputPCI {

    VirtIOPCIProxy parent_obj;

    VirtIOInput vdev;

};



/* Virtio ABI version, if we increment this, we break the guest driver. */

#define VIRTIO_PCI_ABI_VERSION          0