Commit f7f7464a authored by KONRAD Frederic's avatar KONRAD Frederic Committed by Anthony Liguori
Browse files

virtio-serial-pci: switch to the new API. 



Here the virtio-serial-pci is modified for the new API. The device
virtio-serial-pci extends virtio-pci. It creates and connects a
virtio-serial during the init. The properties are not changed.

Signed-off-by: default avatarKONRAD Frederic <fred.konrad@greensocs.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Tested-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: default avatarAmit Shah <amit.shah@redhat.com>
Message-id: 1365512016-21944-3-git-send-email-fred.konrad@greensocs.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 2cd2b016

hw/virtio/virtio-pci.c

+65 −66
Original line number Diff line number Diff line
@@ -942,40 +942,6 @@ static void virtio_exit_pci(PCIDevice *pci_dev) 
    msix_uninit_exclusive_bar(pci_dev);

}



static int virtio_serial_init_pci(PCIDevice *pci_dev)

{

    VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);

    VirtIODevice *vdev;



    if (proxy->class_code != PCI_CLASS_COMMUNICATION_OTHER &&

        proxy->class_code != PCI_CLASS_DISPLAY_OTHER && /* qemu 0.10 */

        proxy->class_code != PCI_CLASS_OTHERS)          /* qemu-kvm  */

        proxy->class_code = PCI_CLASS_COMMUNICATION_OTHER;



    vdev = virtio_serial_init(&pci_dev->qdev, &proxy->serial);

    if (!vdev) {

        return -1;

    }



    /* backwards-compatibility with machines that were created with

       DEV_NVECTORS_UNSPECIFIED */

    vdev->nvectors = proxy->nvectors == DEV_NVECTORS_UNSPECIFIED

                                        ? proxy->serial.max_virtserial_ports + 1

                                        : proxy->nvectors;

    virtio_init_pci(proxy, vdev);

    proxy->nvectors = vdev->nvectors;

    return 0;

}



static void virtio_serial_exit_pci(PCIDevice *pci_dev)

{

    VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);



    virtio_pci_stop_ioeventfd(proxy);

    virtio_serial_exit(proxy->vdev);

    virtio_exit_pci(pci_dev);

}



static int virtio_net_init_pci(PCIDevice *pci_dev)

{

    VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
@@ -1070,37 +1036,6 @@ static const TypeInfo virtio_net_info = { 
    .class_init    = virtio_net_class_init,

};



static Property virtio_serial_properties[] = {

    DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),

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

    DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0),

    DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features),

    DEFINE_VIRTIO_SERIAL_PROPERTIES(VirtIOPCIProxy, serial),

    DEFINE_PROP_END_OF_LIST(),

};



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

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->init = virtio_serial_init_pci;

    k->exit = virtio_serial_exit_pci;

    k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;

    k->device_id = PCI_DEVICE_ID_VIRTIO_CONSOLE;

    k->revision = VIRTIO_PCI_ABI_VERSION;

    k->class_id = PCI_CLASS_COMMUNICATION_OTHER;

    dc->reset = virtio_pci_reset;

    dc->props = virtio_serial_properties;

}



static const TypeInfo virtio_serial_info = {

    .name          = "virtio-serial-pci",

    .parent        = TYPE_PCI_DEVICE,

    .instance_size = sizeof(VirtIOPCIProxy),

    .class_init    = virtio_serial_class_init,

};



static void virtio_rng_initfn(Object *obj)

{

    PCIDevice *pci_dev = PCI_DEVICE(obj);
@@ -1460,6 +1395,70 @@ static const TypeInfo virtio_balloon_pci_info = { 
    .class_init    = virtio_balloon_pci_class_init,

};



/* virtio-serial-pci */



static int virtio_serial_pci_init(VirtIOPCIProxy *vpci_dev)

{

    VirtIOSerialPCI *dev = VIRTIO_SERIAL_PCI(vpci_dev);

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



    if (vpci_dev->class_code != PCI_CLASS_COMMUNICATION_OTHER &&

        vpci_dev->class_code != PCI_CLASS_DISPLAY_OTHER && /* qemu 0.10 */

        vpci_dev->class_code != PCI_CLASS_OTHERS) {        /* qemu-kvm  */

            vpci_dev->class_code = PCI_CLASS_COMMUNICATION_OTHER;

    }



    /* backwards-compatibility with machines that were created with

       DEV_NVECTORS_UNSPECIFIED */

    if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {

        vpci_dev->nvectors = dev->vdev.serial.max_virtserial_ports + 1;

    }



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

    if (qdev_init(vdev) < 0) {

        return -1;

    }

    return 0;

}



static Property virtio_serial_pci_properties[] = {

    DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,

                    VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),

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

    DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0),

    DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features),

    DEFINE_VIRTIO_SERIAL_PROPERTIES(VirtIOSerialPCI, vdev.serial),

    DEFINE_PROP_END_OF_LIST(),

};



static void virtio_serial_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->init = virtio_serial_pci_init;

    dc->props = virtio_serial_pci_properties;

    pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;

    pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_CONSOLE;

    pcidev_k->revision = VIRTIO_PCI_ABI_VERSION;

    pcidev_k->class_id = PCI_CLASS_COMMUNICATION_OTHER;

}



static void virtio_serial_pci_instance_init(Object *obj)

{

    VirtIOSerialPCI *dev = VIRTIO_SERIAL_PCI(obj);

    object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_SERIAL);

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

}



static const TypeInfo virtio_serial_pci_info = {

    .name          = TYPE_VIRTIO_SERIAL_PCI,

    .parent        = TYPE_VIRTIO_PCI,

    .instance_size = sizeof(VirtIOSerialPCI),

    .instance_init = virtio_serial_pci_instance_init,

    .class_init    = virtio_serial_pci_class_init,

};



/* virtio-pci-bus */



void virtio_pci_bus_new(VirtioBusState *bus, VirtIOPCIProxy *dev)
@@ -1499,7 +1498,6 @@ static const TypeInfo virtio_pci_bus_info = { 
static void virtio_pci_register_types(void)

{

    type_register_static(&virtio_net_info);

    type_register_static(&virtio_serial_info);

    type_register_static(&virtio_rng_info);

    type_register_static(&virtio_pci_bus_info);

    type_register_static(&virtio_pci_info);
@@ -1509,6 +1507,7 @@ static void virtio_pci_register_types(void) 
    type_register_static(&virtio_blk_pci_info);

    type_register_static(&virtio_scsi_pci_info);

    type_register_static(&virtio_balloon_pci_info);

    type_register_static(&virtio_serial_pci_info);

}



type_init(virtio_pci_register_types)

hw/virtio/virtio-pci.h

+13 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ typedef struct VirtIOPCIProxy VirtIOPCIProxy; 
typedef struct VirtIOBlkPCI VirtIOBlkPCI;

typedef struct VirtIOSCSIPCI VirtIOSCSIPCI;

typedef struct VirtIOBalloonPCI VirtIOBalloonPCI;

typedef struct VirtIOSerialPCI VirtIOSerialPCI;



/* virtio-pci-bus */
@@ -82,7 +83,6 @@ struct VirtIOPCIProxy { 
#ifdef CONFIG_VIRTFS

    V9fsConf fsconf;

#endif

    virtio_serial_conf serial;

    virtio_net_conf net;

    VirtIORNGConf rng;

    bool ioeventfd_disabled;
@@ -130,6 +130,18 @@ struct VirtIOBalloonPCI { 
    VirtIOBalloon vdev;

};



/*

 * virtio-serial-pci: This extends VirtioPCIProxy.

 */

#define TYPE_VIRTIO_SERIAL_PCI "virtio-serial-pci"

#define VIRTIO_SERIAL_PCI(obj) \

        OBJECT_CHECK(VirtIOSerialPCI, (obj), TYPE_VIRTIO_SERIAL_PCI)



struct VirtIOSerialPCI {

    VirtIOPCIProxy parent_obj;

    VirtIOSerial vdev;

};



void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev);

void virtio_pci_bus_new(VirtioBusState *bus, VirtIOPCIProxy *dev);