[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 13/22] hw/virtio: add vhost-user-gpio-pci boilerplate
From: |
Alex Bennée |
Subject: |
[PATCH v4 13/22] hw/virtio: add vhost-user-gpio-pci boilerplate |
Date: |
Tue, 2 Aug 2022 10:50:01 +0100 |
From: Viresh Kumar <viresh.kumar@linaro.org>
This allows is to instantiate a vhost-user-gpio device as part of a PCI
bus. It is mostly boilerplate which looks pretty similar to the
vhost-user-fs-pci device.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id:
<5f560cab92d0d789b1c94295ec74b9952907d69d.1641987128.git.viresh.kumar@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
v4
- tweak MAINTAINER
---
hw/virtio/vhost-user-gpio-pci.c | 69 +++++++++++++++++++++++++++++++++
MAINTAINERS | 2 +-
hw/virtio/meson.build | 1 +
3 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 hw/virtio/vhost-user-gpio-pci.c
diff --git a/hw/virtio/vhost-user-gpio-pci.c b/hw/virtio/vhost-user-gpio-pci.c
new file mode 100644
index 0000000000..b3028a24a1
--- /dev/null
+++ b/hw/virtio/vhost-user-gpio-pci.c
@@ -0,0 +1,69 @@
+/*
+ * Vhost-user gpio virtio device PCI glue
+ *
+ * Copyright (c) 2022 Viresh Kumar <viresh.kumar@linaro.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "hw/qdev-properties.h"
+#include "hw/virtio/vhost-user-gpio.h"
+#include "hw/virtio/virtio-pci.h"
+
+struct VHostUserGPIOPCI {
+ VirtIOPCIProxy parent_obj;
+ VHostUserGPIO vdev;
+};
+
+typedef struct VHostUserGPIOPCI VHostUserGPIOPCI;
+
+#define TYPE_VHOST_USER_GPIO_PCI "vhost-user-gpio-pci-base"
+
+DECLARE_INSTANCE_CHECKER(VHostUserGPIOPCI, VHOST_USER_GPIO_PCI,
+ TYPE_VHOST_USER_GPIO_PCI)
+
+static void vhost_user_gpio_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
+{
+ VHostUserGPIOPCI *dev = VHOST_USER_GPIO_PCI(vpci_dev);
+ DeviceState *vdev = DEVICE(&dev->vdev);
+
+ vpci_dev->nvectors = 1;
+ qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
+}
+
+static void vhost_user_gpio_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_gpio_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_gpio_pci_instance_init(Object *obj)
+{
+ VHostUserGPIOPCI *dev = VHOST_USER_GPIO_PCI(obj);
+
+ virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
+ TYPE_VHOST_USER_GPIO);
+}
+
+static const VirtioPCIDeviceTypeInfo vhost_user_gpio_pci_info = {
+ .base_name = TYPE_VHOST_USER_GPIO_PCI,
+ .non_transitional_name = "vhost-user-gpio-pci",
+ .instance_size = sizeof(VHostUserGPIOPCI),
+ .instance_init = vhost_user_gpio_pci_instance_init,
+ .class_init = vhost_user_gpio_pci_class_init,
+};
+
+static void vhost_user_gpio_pci_register(void)
+{
+ virtio_pci_types_register(&vhost_user_gpio_pci_info);
+}
+
+type_init(vhost_user_gpio_pci_register);
diff --git a/MAINTAINERS b/MAINTAINERS
index 2c4749a110..bb526df674 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2102,7 +2102,7 @@ vhost-user-gpio
M: Alex Bennée <alex.bennee@linaro.org>
R: Viresh Kumar <viresh.kumar@linaro.org>
S: Maintained
-F: hw/virtio/vhost-user-gpio.c
+F: hw/virtio/vhost-user-gpio*
F: include/hw/virtio/vhost-user-gpio.h
virtio-crypto
diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
index 33c8e71fab..c14e3db10a 100644
--- a/hw/virtio/meson.build
+++ b/hw/virtio/meson.build
@@ -30,6 +30,7 @@ virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true:
files('virtio-mem.c'))
virtio_ss.add(when: 'CONFIG_VHOST_USER_I2C', if_true:
files('vhost-user-i2c.c'))
virtio_ss.add(when: 'CONFIG_VHOST_USER_RNG', if_true:
files('vhost-user-rng.c'))
virtio_ss.add(when: 'CONFIG_VHOST_USER_GPIO', if_true:
files('vhost-user-gpio.c'))
+virtio_ss.add(when: ['CONFIG_VIRTIO_PCI', 'CONFIG_VHOST_USER_GPIO'], if_true:
files('vhost-user-gpio-pci.c'))
virtio_pci_ss = ss.source_set()
virtio_pci_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true:
files('vhost-vsock-pci.c'))
--
2.30.2
- [PATCH v4 06/22] include/hw: document vhost_dev feature life-cycle, (continued)
- [PATCH v4 06/22] include/hw: document vhost_dev feature life-cycle, Alex Bennée, 2022/08/02
- [PATCH v4 01/22] hw/virtio: incorporate backend features in features, Alex Bennée, 2022/08/02
- [PATCH v4 07/22] hw/virtio: fix some coding style issues, Alex Bennée, 2022/08/02
- [PATCH v4 05/22] include/hw/virtio: more comment for VIRTIO_F_BAD_FEATURE, Alex Bennée, 2022/08/02
- [PATCH v4 17/22] tests/qtest: catch unhandled vhost-user messages, Alex Bennée, 2022/08/02
- [PATCH v4 18/22] tests/qtest: plain g_assert for VHOST_USER_F_PROTOCOL_FEATURES, Alex Bennée, 2022/08/02
- [PATCH v4 02/22] hw/virtio: gracefully handle unset vhost_dev vdev, Alex Bennée, 2022/08/02
- [PATCH v4 10/22] hw/virtio: move vm_running check to virtio_device_started, Alex Bennée, 2022/08/02
- [PATCH v4 04/22] hw/virtio: fix vhost_user_read tracepoint, Alex Bennée, 2022/08/02
- [PATCH v4 08/22] hw/virtio: log potentially buggy guest drivers, Alex Bennée, 2022/08/02
- [PATCH v4 13/22] hw/virtio: add vhost-user-gpio-pci boilerplate,
Alex Bennée <=
- [PATCH v4 14/22] tests/qtest: pass stdout/stderr down to subtests, Alex Bennée, 2022/08/02
- [PATCH v4 16/22] tests/qtest: use qos_printf instead of g_test_message, Alex Bennée, 2022/08/02
- [PATCH v4 11/22] hw/virtio: move vhd->started check into helper and add FIXME, Alex Bennée, 2022/08/02
- [PATCH v4 19/22] tests/qtest: add assert to catch bad features, Alex Bennée, 2022/08/02
- [PATCH v4 15/22] tests/qtest: add a timeout for subprocess_run_one_test, Alex Bennée, 2022/08/02
- [PATCH v4 20/22] tests/qtest: implement stub for VHOST_USER_GET_CONFIG, Alex Bennée, 2022/08/02
- [PATCH v4 21/22] tests/qtest: add a get_features op to vhost-user-test, Alex Bennée, 2022/08/02
- [PATCH v4 12/22] hw/virtio: add boilerplate for vhost-user-gpio device, Alex Bennée, 2022/08/02
- [PATCH v4 22/22] tests/qtest: enable tests for virtio-gpio, Alex Bennée, 2022/08/02