From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Viresh Kumar" <viresh.kumar@linaro.org>,
"Mathieu Poirier" <mathieu.poirier@linaro.org>,
"Gonglei (Arei)" <arei.gonglei@huawei.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Erik Schilling" <erik.schilling@linaro.org>,
"Jason Wang" <jasowang@redhat.com>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Gerd Hoffmann" <kraxel@redhat.com>,
virtio-fs@redhat.com,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Eric Blake" <eblake@redhat.com>
Subject: [PATCH v2 08/13] virtio: add PCI stub for vhost-user-device
Date: Tue, 18 Apr 2023 17:21:35 +0100 [thread overview]
Message-ID: <20230418162140.373219-9-alex.bennee@linaro.org> (raw)
In-Reply-To: <20230418162140.373219-1-alex.bennee@linaro.org>
This is all pretty much boilerplate.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Erik Schilling <erik.schilling@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@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;
+};
+
+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)
+
+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);
+ 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'))
--
2.39.2
next prev parent reply other threads:[~2023-04-18 16:22 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-18 16:21 [PATCH v2 00/13] virtio: add vhost-user-generic and reduce copy and paste Alex Bennée
2023-04-18 16:21 ` [PATCH v2 01/13] include: attempt to document device_class_set_props Alex Bennée
2023-04-20 9:21 ` Mark Cave-Ayland
2023-05-23 20:30 ` Stefan Hajnoczi
2023-04-18 16:21 ` [PATCH v2 02/13] include/hw: document the device_class_set_parent_* fns Alex Bennée
2023-04-20 9:24 ` Mark Cave-Ayland
2023-04-18 16:21 ` [PATCH v2 03/13] hw/virtio: fix typo in VIRTIO_CONFIG_IRQ_IDX comments Alex Bennée
2023-04-20 9:25 ` Mark Cave-Ayland
2023-05-23 20:35 ` Stefan Hajnoczi
2023-04-18 16:21 ` [PATCH v2 04/13] include/hw/virtio: document virtio_notify_config Alex Bennée
2023-04-20 9:27 ` Mark Cave-Ayland
2023-05-23 20:40 ` Stefan Hajnoczi
2023-04-18 16:21 ` [PATCH v2 05/13] include/hw/virtio: add kerneldoc for virtio_init Alex Bennée
2023-04-20 9:29 ` Mark Cave-Ayland
2023-05-23 20:41 ` Stefan Hajnoczi
2023-04-18 16:21 ` [PATCH v2 06/13] include/hw/virtio: document some more usage of notifiers Alex Bennée
2023-04-20 9:32 ` Mark Cave-Ayland
2023-05-23 20:52 ` Stefan Hajnoczi
2023-04-18 16:21 ` [PATCH v2 07/13] virtio: add vhost-user-base and a generic vhost-user-device Alex Bennée
2023-04-20 9:47 ` Mark Cave-Ayland
2023-04-18 16:21 ` Alex Bennée [this message]
2023-04-20 9:54 ` [PATCH v2 08/13] virtio: add PCI stub for vhost-user-device Mark Cave-Ayland
2023-04-18 16:21 ` [PATCH v2 09/13] hw/virtio: derive vhost-user-rng from vhost-user-device Alex Bennée
2023-04-20 10:09 ` Mark Cave-Ayland
2023-04-18 16:21 ` [PATCH v2 10/13] hw/virtio: add config support to vhost-user-device Alex Bennée
2023-04-18 16:21 ` [PATCH v2 11/13] hw/virtio: derive vhost-user-gpio from vhost-user-device Alex Bennée
2023-04-20 10:12 ` Mark Cave-Ayland
2023-04-18 16:21 ` [PATCH v2 12/13] hw/virtio: derive vhost-user-i2c from vhost-user-base Alex Bennée
2023-04-20 10:18 ` Mark Cave-Ayland
2023-04-18 16:21 ` [PATCH v2 13/13] docs/system: add a basic enumeration of vhost-user devices Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230418162140.373219-9-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=arei.gonglei@huawei.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=erik.schilling@linaro.org \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=mathieu.poirier@linaro.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=viresh.kumar@linaro.org \
--cc=virtio-fs@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).