[Virtio-fs] [PATCH v2 08/13] virtio: add PCI stub for vhost-user-device

[Mark Cave-Ayland]

On 18/04/2023 17:21, Alex Bennée wrote:

> This is all pretty much boilerplate.
> 
> Signed-off-by: Alex Bennée <alex.bennee at linaro.org>
> Tested-by: Erik Schilling <erik.schilling at linaro.org>
> ---
>   hw/virtio/vhost-user-device-pci.c | 71 +++++++++++++++++++++++++++++++
>   hw/virtio/meson.build             |  1 +
>   2 files changed, 72 insertions(+)
>   create mode 100644 hw/virtio/vhost-user-device-pci.c
> 
> diff --git a/hw/virtio/vhost-user-device-pci.c b/hw/virtio/vhost-user-device-pci.c
> new file mode 100644
> index 0000000000..41f9b7905b
> --- /dev/null
> +++ b/hw/virtio/vhost-user-device-pci.c
> @@ -0,0 +1,71 @@
> +/*
> + * Vhost-user generic virtio device PCI glue
> + *
> + * Copyright (c) 2023 Linaro Ltd
> + * Author: Alex Bennée <alex.bennee at linaro.org>
> + *
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + */
> +
> +#include "qemu/osdep.h"
> +#include "hw/qdev-properties.h"
> +#include "hw/virtio/vhost-user-device.h"
> +#include "hw/virtio/virtio-pci.h"
> +
> +struct VHostUserDevicePCI {
> +    VirtIOPCIProxy parent_obj;
> +    VHostUserBase vub;
> +};

Spacing here, as mentioned in my previous email.

> +typedef struct VHostUserDevicePCI VHostUserDevicePCI;
> +
> +#define TYPE_VHOST_USER_DEVICE_PCI "vhost-user-device-pci-base"
> +
> +DECLARE_INSTANCE_CHECKER(VHostUserDevicePCI,
> +                         VHOST_USER_DEVICE_PCI,
> +                         TYPE_VHOST_USER_DEVICE_PCI)

You should be able to drop the typedef here and replace DECLARE_INSTANCE_CHECKER with 
OBJECT_DECLARE_SIMPLE_TYPE.

> +static void vhost_user_device_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
> +{
> +    VHostUserDevicePCI *dev = VHOST_USER_DEVICE_PCI(vpci_dev);
> +    DeviceState *vdev = DEVICE(&dev->vub);
> +
> +    vpci_dev->nvectors = 1;
> +    qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
> +}
> +
> +static void vhost_user_device_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);

Minor nit: an empty line after the class casts here makes it much easier to read.

> +    k->realize = vhost_user_device_pci_realize;
> +    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
> +    pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
> +    pcidev_k->device_id = 0; /* Set by virtio-pci based on virtio id */
> +    pcidev_k->revision = 0x00;
> +    pcidev_k->class_id = PCI_CLASS_COMMUNICATION_OTHER;
> +}
> +
> +static void vhost_user_device_pci_instance_init(Object *obj)
> +{
> +    VHostUserDevicePCI *dev = VHOST_USER_DEVICE_PCI(obj);
> +
> +    virtio_instance_init_common(obj, &dev->vub, sizeof(dev->vub),
> +                                TYPE_VHOST_USER_DEVICE);
> +}
> +
> +static const VirtioPCIDeviceTypeInfo vhost_user_device_pci_info = {
> +    .base_name = TYPE_VHOST_USER_DEVICE_PCI,
> +    .non_transitional_name = "vhost-user-device-pci",
> +    .instance_size = sizeof(VHostUserDevicePCI),
> +    .instance_init = vhost_user_device_pci_instance_init,
> +    .class_init = vhost_user_device_pci_class_init,
> +};
> +
> +static void vhost_user_device_pci_register(void)
> +{
> +    virtio_pci_types_register(&vhost_user_device_pci_info);
> +}
> +
> +type_init(vhost_user_device_pci_register);
> diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
> index 43e5fa3f7d..c0a86b94ae 100644
> --- a/hw/virtio/meson.build
> +++ b/hw/virtio/meson.build
> @@ -13,6 +13,7 @@ if have_vhost
>       # fixme - this really should be generic
>       specific_virtio_ss.add(files('vhost-user.c'))
>       softmmu_virtio_ss.add(files('vhost-user-device.c'))
> +    softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('vhost-user-device-pci.c'))
>     endif
>     if have_vhost_vdpa
>       specific_virtio_ss.add(files('vhost-vdpa.c', 'vhost-shadow-virtqueue.c'))


ATB,

Mark.