[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/2] vfio/platform: make the vfio-platform device no
From: |
Eric Auger |
Subject: |
[Qemu-devel] [PATCH 1/2] vfio/platform: make the vfio-platform device non abstract |
Date: |
Tue, 21 Feb 2017 14:18:19 +0100 |
Up to now the vfio-platform device has been abstract and could not be
instantiated. The integration of a new vfio platform device required
to create a dummy derived device which only set the compatibility
string.
Following the few vfio-platform device integration we have seen
the actual requested adaptation happens on device tree node creation
(sysbus-fdt).
So this patch removes the abstract setting and defines 2 new options,
manufacturer and model that are used to build a compatibility string.
This latter will be used to match the device tree node creation
function
sysbus-fdt does not support the instantiation of the vfio-platform
device yet.
Signed-off-by: Eric Auger <address@hidden>
---
hw/vfio/platform.c | 18 ++++++++++++++++--
include/hw/vfio/vfio-platform.h | 2 ++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index a4663c9..73c0489 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -637,7 +637,20 @@ static void vfio_platform_realize(DeviceState *dev, Error
**errp)
VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(dev);
SysBusDevice *sbdev = SYS_BUS_DEVICE(dev);
VFIODevice *vbasedev = &vdev->vbasedev;
- int i, ret;
+ int i, ret = -EINVAL;
+
+ if (!vdev->compat) {
+ if (!vdev->model) {
+ error_setg(errp, "no usable compatible string");
+ goto out;
+ }
+ if (!vdev->manufacturer) {
+ vdev->compat = g_strdup(vdev->model);
+ } else {
+ vdev->compat = g_strjoin(",", vdev->manufacturer,
+ vdev->model, NULL);
+ }
+ }
vbasedev->type = VFIO_DEVICE_TYPE_PLATFORM;
vbasedev->ops = &vfio_platform_ops;
@@ -678,6 +691,8 @@ static const VMStateDescription vfio_platform_vmstate = {
static Property vfio_platform_dev_properties[] = {
DEFINE_PROP_STRING("host", VFIOPlatformDevice, vbasedev.name),
DEFINE_PROP_STRING("sysfsdev", VFIOPlatformDevice, vbasedev.sysfsdev),
+ DEFINE_PROP_STRING("manufacturer", VFIOPlatformDevice, manufacturer),
+ DEFINE_PROP_STRING("model", VFIOPlatformDevice, model),
DEFINE_PROP_BOOL("x-no-mmap", VFIOPlatformDevice, vbasedev.no_mmap, false),
DEFINE_PROP_UINT32("mmap-timeout-ms", VFIOPlatformDevice,
mmap_timeout, 1100),
@@ -704,7 +719,6 @@ static const TypeInfo vfio_platform_dev_info = {
.instance_size = sizeof(VFIOPlatformDevice),
.class_init = vfio_platform_class_init,
.class_size = sizeof(VFIOPlatformDeviceClass),
- .abstract = true,
};
static void register_vfio_platform_dev_type(void)
diff --git a/include/hw/vfio/vfio-platform.h b/include/hw/vfio/vfio-platform.h
index 9baaa2db..31b9a98 100644
--- a/include/hw/vfio/vfio-platform.h
+++ b/include/hw/vfio/vfio-platform.h
@@ -55,6 +55,8 @@ typedef struct VFIOPlatformDevice {
/* queue of pending IRQs */
QSIMPLEQ_HEAD(pending_intp_queue, VFIOINTp) pending_intp_queue;
char *compat; /* compatibility string */
+ char *manufacturer; /* manufacturer (1st part of the compatible property)
*/
+ char *model; /* model (2d part of the compatible property) */
uint32_t mmap_timeout; /* delay to re-enable mmaps after interrupt */
QEMUTimer *mmap_timer; /* allows fast-path resume after IRQ hit */
QemuMutex intp_mutex; /* protect the intp_list IRQ state */
--
2.5.5
- [Qemu-devel] [PATCH 0/2] Allow direct vfio-platform device instantiation, Eric Auger, 2017/02/21
- [Qemu-devel] [PATCH 1/2] vfio/platform: make the vfio-platform device non abstract,
Eric Auger <=
- Re: [Qemu-devel] [PATCH 1/2] vfio/platform: make the vfio-platform device non abstract, Sinan Kaya, 2017/02/21
- Re: [Qemu-devel] [PATCH 1/2] vfio/platform: make the vfio-platform device non abstract, Auger Eric, 2017/02/21
- Re: [Qemu-devel] [PATCH 1/2] vfio/platform: make the vfio-platform device non abstract, Sinan Kaya, 2017/02/21
- Re: [Qemu-devel] [PATCH 1/2] vfio/platform: make the vfio-platform device non abstract, Auger Eric, 2017/02/21
- Re: [Qemu-devel] [PATCH 1/2] vfio/platform: make the vfio-platform device non abstract, Sinan Kaya, 2017/02/21
- Re: [Qemu-devel] [PATCH 1/2] vfio/platform: make the vfio-platform device non abstract, Auger Eric, 2017/02/21
- Re: [Qemu-devel] [PATCH 1/2] vfio/platform: make the vfio-platform device non abstract, Sinan Kaya, 2017/02/21
[Qemu-devel] [PATCH 2/2] hw/arm/sysbus-fdt: Allow device matching with compat string, Eric Auger, 2017/02/21
Re: [Qemu-devel] [PATCH 0/2] Allow direct vfio-platform device instantiation, no-reply, 2017/02/21