[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v3 2/3] hw/vfio: amba device support
From: |
Baptiste Reynal |
Subject: |
[Qemu-devel] [RFC PATCH v3 2/3] hw/vfio: amba device support |
Date: |
Wed, 11 Feb 2015 17:22:02 +0100 |
Add VFIO_DEVICE_TYPE_AMBA.
Differentiate amba and platform devices according to compatible string.
Signed-off-by: Baptiste Reynal <address@hidden>
---
v2 -> v3:
add amba flag check in vfio_populate_device
---
hw/vfio/platform.c | 20 +++++++++++++++-----
include/hw/vfio/vfio-common.h | 1 +
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index 4bc989c..04cd3dd 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -422,8 +422,9 @@ static int vfio_populate_device(VFIODevice *vbasedev)
VFIOPlatformDevice *vdev =
container_of(vbasedev, VFIOPlatformDevice, vbasedev);
- if (!(vbasedev->flags & VFIO_DEVICE_FLAGS_PLATFORM)) {
- error_report("vfio: Um, this isn't a platform device");
+ if (!(vbasedev->flags & (VFIO_DEVICE_FLAGS_PLATFORM |
+ VFIO_DEVICE_FLAGS_AMBA))) {
+ error_report("vfio: Um, this isn't a platform neither an amba device");
goto error;
}
@@ -521,8 +522,13 @@ static int vfio_base_device_init(VFIODevice *vbasedev)
}
/* Check that the host device exists */
- snprintf(path, sizeof(path), "/sys/bus/platform/devices/%s/",
- vbasedev->name);
+ if (vbasedev->type == VFIO_DEVICE_TYPE_AMBA) {
+ snprintf(path, sizeof(path), "/sys/bus/amba/devices/%s/",
+ vbasedev->name);
+ } else {
+ snprintf(path, sizeof(path), "/sys/bus/platform/devices/%s/",
+ vbasedev->name);
+ }
if (stat(path, &st) < 0) {
error_report("vfio: error: no such host device: %s", path);
@@ -619,7 +625,11 @@ static void vfio_platform_realize(DeviceState *dev, Error
**errp)
VFIODevice *vbasedev = &vdev->vbasedev;
int i, ret;
- vbasedev->type = VFIO_DEVICE_TYPE_PLATFORM;
+ if (strstr(vdev->compat, "arm,primecell")) {
+ vbasedev->type = VFIO_DEVICE_TYPE_AMBA;
+ } else {
+ vbasedev->type = VFIO_DEVICE_TYPE_PLATFORM;
+ }
vbasedev->ops = &vfio_platform_ops;
#ifdef CONFIG_KVM
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index b5af090..8ab880a 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -44,6 +44,7 @@
enum {
VFIO_DEVICE_TYPE_PCI = 0,
VFIO_DEVICE_TYPE_PLATFORM = 1,
+ VFIO_DEVICE_TYPE_AMBA = 2,
};
typedef struct VFIORegion {
--
2.3.0