motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 17:23:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

vfio/platform: Make the vfio-platform device non-abstract

Browse source 
Up to now the vfio-platform device has been abstract and could not be
instantiated.  The integration of a new vfio platform device required
creating a dummy derived device which only set the compatible string.

Following the few vfio-platform device integrations we have seen the
actual requested adaptation happens on device tree node creation
(sysbus-fdt).

Hence remove the abstract setting, and read the list of compatible
values from sysfs if not set by a derived device.

Update the amd-xgbe and calxeda-xgmac drivers to fill in the number of
compatible values, as there can now be more than one.

Note that sysbus-fdt does not support the instantiation of the
vfio-platform device yet.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
[geert: Rebase, set user_creatable=true, use compatible values in sysfs
	instead of user-supplied manufacturer/model options, reword]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Eric Auger 2018-10-15 10:52:09 -06:00 • committed by Alex Williamson
parent b290659fc3
commit a49531ebd0
4 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
hw/vfio/platform.c
View file

@ -655,6 +655,28 @@ static void vfio_platform_realize(DeviceState *dev, Error **errp)
goto out;
}
if (!vdev->compat) {
GError *gerr = NULL;
gchar *contents;
gsize length;
char *path;
path = g_strdup_printf("%s/of_node/compatible", vbasedev->sysfsdev);
if (!g_file_get_contents(path, &contents, &length, &gerr)) {
error_setg(errp, "%s", gerr->message);
g_error_free(gerr);
g_free(path);
return;
}
g_free(path);
vdev->compat = contents;
for (vdev->num_compat = 0; length; vdev->num_compat++) {
size_t skip = strlen(contents) + 1;
contents += skip;
length -= skip;
}
}
for (i = 0; i < vbasedev->num_regions; i++) {
if (vfio_region_mmap(vdev->regions[i])) {
error_report("%s mmap unsupported. Performance may be slow",
@ -700,6 +722,8 @@ static void vfio_platform_class_init(ObjectClass *klass, void *data)
dc->desc = "VFIO-based platform device assignment";
sbc->connect_irq_notifier = vfio_start_irqfd_injection;
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
/* Supported by TYPE_VIRT_MACHINE */
dc->user_creatable = true;
}
static const TypeInfo vfio_platform_dev_info = {
@ -708,7 +732,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)