[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC PATCH V8 09/15] virtio-blk-pci : Switch to new API
From: |
Anthony Liguori |
Subject: |
Re: [Qemu-devel] [RFC PATCH V8 09/15] virtio-blk-pci : Switch to new API. |
Date: |
Wed, 02 Jan 2013 08:18:29 -0600 |
User-agent: |
Notmuch/0.13.2+93~ged93d79 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) |
address@hidden writes:
> From: KONRAD Frederic <address@hidden>
>
> Here the virtio-blk-pci is modified for the new API. The device virtio-blk-pci
> extends virtio-pci. It creates and connects a virtio-blk during the init.
>
> Signed-off-by: KONRAD Frederic <address@hidden>
> ---
> hw/virtio-pci.c | 106
> +++++++++++++++++++++-----------------------------------
> hw/virtio-pci.h | 14 +++++++-
> 2 files changed, 53 insertions(+), 67 deletions(-)
>
> diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
> index 877bf38..e3a8276 100644
> --- a/hw/virtio-pci.c
> +++ b/hw/virtio-pci.c
> @@ -734,26 +734,6 @@ void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice
> *vdev)
> proxy->host_features = vdev->get_features(vdev, proxy->host_features);
> }
>
> -static int virtio_blk_init_pci(PCIDevice *pci_dev)
> -{
> - VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
> - VirtIODevice *vdev;
> -
> - if (proxy->class_code != PCI_CLASS_STORAGE_SCSI &&
> - proxy->class_code != PCI_CLASS_STORAGE_OTHER)
> - proxy->class_code = PCI_CLASS_STORAGE_SCSI;
> -
> - vdev = virtio_blk_init(&pci_dev->qdev, &proxy->blk);
> - if (!vdev) {
> - return -1;
> - }
> - vdev->nvectors = proxy->nvectors;
> - virtio_init_pci(proxy, vdev);
> - /* make the actual value visible */
> - proxy->nvectors = vdev->nvectors;
> - return 0;
> -}
> -
> static void virtio_exit_pci(PCIDevice *pci_dev)
> {
> VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
> @@ -762,15 +742,6 @@ static void virtio_exit_pci(PCIDevice *pci_dev)
> msix_uninit_exclusive_bar(pci_dev);
> }
>
> -static void virtio_blk_exit_pci(PCIDevice *pci_dev)
> -{
> - VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
> -
> - virtio_pci_stop_ioeventfd(proxy);
> - virtio_blk_exit(proxy->vdev);
> - virtio_exit_pci(pci_dev);
> -}
> -
> static int virtio_serial_init_pci(PCIDevice *pci_dev)
> {
> VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
> @@ -888,42 +859,6 @@ static void virtio_rng_exit_pci(PCIDevice *pci_dev)
> virtio_exit_pci(pci_dev);
> }
>
> -static Property virtio_blk_properties[] = {
> - DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0),
> - DEFINE_BLOCK_PROPERTIES(VirtIOPCIProxy, blk.conf),
> - DEFINE_BLOCK_CHS_PROPERTIES(VirtIOPCIProxy, blk.conf),
> - DEFINE_PROP_STRING("serial", VirtIOPCIProxy, blk.serial),
> -#ifdef __linux__
> - DEFINE_PROP_BIT("scsi", VirtIOPCIProxy, blk.scsi, 0, true),
> -#endif
> - DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
> VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
> - DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),
> - DEFINE_VIRTIO_BLK_FEATURES(VirtIOPCIProxy, host_features),
> - DEFINE_PROP_END_OF_LIST(),
> -};
> -
> -static void virtio_blk_class_init(ObjectClass *klass, void *data)
> -{
> - DeviceClass *dc = DEVICE_CLASS(klass);
> - PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
> -
> - k->init = virtio_blk_init_pci;
> - k->exit = virtio_blk_exit_pci;
> - k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
> - k->device_id = PCI_DEVICE_ID_VIRTIO_BLOCK;
> - k->revision = VIRTIO_PCI_ABI_VERSION;
> - k->class_id = PCI_CLASS_STORAGE_SCSI;
> - dc->reset = virtio_pci_reset;
> - dc->props = virtio_blk_properties;
> -}
> -
> -static TypeInfo virtio_blk_info = {
> - .name = "virtio-blk-pci",
> - .parent = TYPE_PCI_DEVICE,
> - .instance_size = sizeof(VirtIOPCIProxy),
> - .class_init = virtio_blk_class_init,
> -};
> -
> static Property virtio_net_properties[] = {
> DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
> VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, false),
> DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 3),
> @@ -1248,6 +1183,45 @@ static const TypeInfo virtio_pci_info = {
> .class_size = sizeof(VirtioPCIClass),
> };
>
> +/* virtio-blk-pci */
> +
> +static Property virtio_blk_pci_properties[] = {
> + DEFINE_PROP_HEX32("class", VirtIOBlkPCI, parent_obj.class_code, 0),
> + DEFINE_PROP_BIT("ioeventfd", VirtIOBlkPCI, parent_obj.flags,
> + VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
> + DEFINE_PROP_UINT32("vectors", VirtIOBlkPCI, parent_obj.nvectors, 2),
> + DEFINE_VIRTIO_BLK_FEATURES(VirtIOBlkPCI, parent_obj.host_features),
> + DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkPCI, blk),
> + DEFINE_PROP_END_OF_LIST(),
> +};
> +
> +static int virtio_blk_pci_init(VirtIOPCIProxy *vpci_dev)
> +{
> + DeviceState *vdev;
> + VirtIOBlkPCI *dev = VIRTIO_BLK_PCI(vpci_dev);
> + vdev = qdev_create(BUS(vpci_dev->bus), "virtio-blk");
This is the wrong way to do this.
You should do object_initialize() and object_property_add_child() in an
initialization function for this type.
You can qdev_set_parent_bus() in the initialization function, but defer
the qdev_init() until here for the child.
Regards,
Anthony Liguori
> + virtio_blk_set_conf(vdev, &(dev->blk));
> + if (qdev_init(vdev) < 0) {
> + return -1;
> + }
> + return 0;
> +}
> +
> +static void virtio_blk_pci_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> + VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);
> + dc->props = virtio_blk_pci_properties;
> + k->init = virtio_blk_pci_init;
> +}
> +
> +static const TypeInfo virtio_blk_pci_info = {
> + .name = TYPE_VIRTIO_BLK_PCI,
> + .parent = TYPE_VIRTIO_PCI,
> + .instance_size = sizeof(VirtIOBlkPCI),
> + .class_init = virtio_blk_pci_class_init,
> +};
> +
> /* virtio-pci-bus */
>
> VirtioBusState *virtio_pci_bus_new(VirtIOPCIProxy *dev)
> @@ -1287,7 +1261,6 @@ static const TypeInfo virtio_pci_bus_info = {
>
> static void virtio_pci_register_types(void)
> {
> - type_register_static(&virtio_blk_info);
> type_register_static(&virtio_net_info);
> type_register_static(&virtio_serial_info);
> type_register_static(&virtio_balloon_info);
> @@ -1295,6 +1268,7 @@ static void virtio_pci_register_types(void)
> type_register_static(&virtio_rng_info);
> type_register_static(&virtio_pci_bus_info);
> type_register_static(&virtio_pci_info);
> + type_register_static(&virtio_blk_pci_info);
> }
>
> type_init(virtio_pci_register_types)
> diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h
> index e840cea..8a68d6e 100644
> --- a/hw/virtio-pci.h
> +++ b/hw/virtio-pci.h
> @@ -24,6 +24,7 @@
>
> /* VirtIOPCIProxy will be renammed VirtioPCIState at the end. */
> typedef struct VirtIOPCIProxy VirtIOPCIProxy;
> +typedef struct VirtIOBlkPCI VirtIOBlkPCI;
>
> /* virtio-pci-bus */
> #define TYPE_VIRTIO_PCI_BUS "virtio-pci-bus"
> @@ -69,7 +70,6 @@ struct VirtIOPCIProxy {
> uint32_t flags;
> uint32_t class_code;
> uint32_t nvectors;
> - VirtIOBlkConf blk;
> NICConf nic;
> uint32_t host_features;
> #ifdef CONFIG_LINUX
> @@ -87,6 +87,18 @@ struct VirtIOPCIProxy {
> /* Nothing more for the moment. */
> };
>
> +/*
> + * virtio-blk-pci : This extends VirtioPCIProxy.
> + */
> +#define TYPE_VIRTIO_BLK_PCI "virtio-blk-pci"
> +#define VIRTIO_BLK_PCI(obj) \
> + OBJECT_CHECK(VirtIOBlkPCI, (obj), TYPE_VIRTIO_BLK_PCI)
> +
> +struct VirtIOBlkPCI {
> + VirtIOPCIProxy parent_obj;
> + VirtIOBlkConf blk;
> +};
> +
> void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev);
> void virtio_pci_reset(DeviceState *d);
>
> --
> 1.7.11.7
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [RFC PATCH V8 09/15] virtio-blk-pci : Switch to new API.,
Anthony Liguori <=