[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/19] vfio/platform: Pass an error object to vfio_ba
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PULL 13/19] vfio/platform: Pass an error object to vfio_base_device_init |
Date: |
Mon, 17 Oct 2016 13:53:38 -0600 |
User-agent: |
StGit/0.17.1-dirty |
From: Eric Auger <address@hidden>
This patch propagates errors encountered during vfio_base_device_init
up to the realize function.
In case the host value is not set or badly formed we now report an
error.
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>
---
hw/vfio/platform.c | 50 +++++++++++++++++++++++++++-----------------------
1 file changed, 27 insertions(+), 23 deletions(-)
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index 484e31f..a4663c9 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -541,13 +541,14 @@ static VFIODeviceOps vfio_platform_ops = {
/**
* vfio_base_device_init - perform preliminary VFIO setup
* @vbasedev: the VFIO device handle
+ * @errp: error object
*
* Implement the VFIO command sequence that allows to discover
* assigned device resources: group extraction, device
* fd retrieval, resource query.
* Precondition: the device name must be initialized
*/
-static int vfio_base_device_init(VFIODevice *vbasedev)
+static int vfio_base_device_init(VFIODevice *vbasedev, Error **errp)
{
VFIOGroup *group;
VFIODevice *vbasedev_iter;
@@ -555,7 +556,6 @@ static int vfio_base_device_init(VFIODevice *vbasedev)
ssize_t len;
struct stat st;
int groupid;
- Error *err = NULL;
int ret;
/* @sysfsdev takes precedence over @host */
@@ -564,6 +564,7 @@ static int vfio_base_device_init(VFIODevice *vbasedev)
vbasedev->name = g_strdup(basename(vbasedev->sysfsdev));
} else {
if (!vbasedev->name || strchr(vbasedev->name, '/')) {
+ error_setg(errp, "wrong host device name");
return -EINVAL;
}
@@ -572,8 +573,8 @@ static int vfio_base_device_init(VFIODevice *vbasedev)
}
if (stat(vbasedev->sysfsdev, &st) < 0) {
- error_report("vfio: error: no such host device: %s",
- vbasedev->sysfsdev);
+ error_setg_errno(errp, errno,
+ "failed to get the sysfs host device file status");
return -errno;
}
@@ -582,49 +583,44 @@ static int vfio_base_device_init(VFIODevice *vbasedev)
g_free(tmp);
if (len < 0 || len >= sizeof(group_path)) {
- error_report("vfio: error no iommu_group for device");
- return len < 0 ? -errno : -ENAMETOOLONG;
+ ret = len < 0 ? -errno : -ENAMETOOLONG;
+ error_setg_errno(errp, -ret, "no iommu_group found");
+ return ret;
}
group_path[len] = 0;
group_name = basename(group_path);
if (sscanf(group_name, "%d", &groupid) != 1) {
- error_report("vfio: error reading %s: %m", group_path);
+ error_setg_errno(errp, errno, "failed to read %s", group_path);
return -errno;
}
trace_vfio_platform_base_device_init(vbasedev->name, groupid);
- group = vfio_get_group(groupid, &address_space_memory, &err);
+ group = vfio_get_group(groupid, &address_space_memory, errp);
if (!group) {
- ret = -ENOENT;
- goto error;
+ return -ENOENT;
}
QLIST_FOREACH(vbasedev_iter, &group->device_list, next) {
if (strcmp(vbasedev_iter->name, vbasedev->name) == 0) {
- error_report("vfio: error: device %s is already attached",
- vbasedev->name);
+ error_setg(errp, "device is already attached");
vfio_put_group(group);
return -EBUSY;
}
}
- ret = vfio_get_device(group, vbasedev->name, vbasedev, &err);
+ ret = vfio_get_device(group, vbasedev->name, vbasedev, errp);
if (ret) {
vfio_put_group(group);
- goto error;
+ return ret;
}
- ret = vfio_populate_device(vbasedev, &err);
+ ret = vfio_populate_device(vbasedev, errp);
if (ret) {
vfio_put_group(group);
}
-error:
- if (err) {
- error_reportf_err(err, ERR_PREFIX, vbasedev->name);
- }
return ret;
}
@@ -650,11 +646,9 @@ static void vfio_platform_realize(DeviceState *dev, Error
**errp)
vbasedev->sysfsdev : vbasedev->name,
vdev->compat);
- ret = vfio_base_device_init(vbasedev);
+ ret = vfio_base_device_init(vbasedev, errp);
if (ret) {
- error_setg(errp, "vfio: vfio_base_device_init failed for %s",
- vbasedev->name);
- return;
+ goto out;
}
for (i = 0; i < vbasedev->num_regions; i++) {
@@ -664,6 +658,16 @@ static void vfio_platform_realize(DeviceState *dev, Error
**errp)
}
sysbus_init_mmio(sbdev, vdev->regions[i]->mem);
}
+out:
+ if (!ret) {
+ return;
+ }
+
+ if (vdev->vbasedev.name) {
+ error_prepend(errp, ERR_PREFIX, vdev->vbasedev.name);
+ } else {
+ error_prepend(errp, "vfio error: ");
+ }
}
static const VMStateDescription vfio_platform_vmstate = {
- [Qemu-devel] [PULL 03/19] vfio/pci: Pass an error object to vfio_populate_device, (continued)
- [Qemu-devel] [PULL 03/19] vfio/pci: Pass an error object to vfio_populate_device, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 04/19] vfio/pci: Pass an error object to vfio_msix_early_setup, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 05/19] vfio/pci: Pass an error object to vfio_intx_enable, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 06/19] vfio/pci: Pass an error object to vfio_add_capabilities, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 07/19] vfio/pci: Pass an error object to vfio_pci_igd_opregion_init, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 08/19] vfio: Pass an Error object to vfio_connect_container, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 09/19] vfio: Pass an error object to vfio_get_group, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 10/19] vfio: Pass an error object to vfio_get_device, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 11/19] vfio/platform: Pass an error object to vfio_populate_device, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 12/19] vfio/platform: fix a wrong returned value in vfio_populate_device, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 13/19] vfio/platform: Pass an error object to vfio_base_device_init,
Alex Williamson <=
- [Qemu-devel] [PULL 14/19] vfio/pci: Conversion to realize, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 15/19] vfio/pci: Remove vfio_msix_early_setup returned value, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 16/19] vfio/pci: Remove vfio_populate_device returned value, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 17/19] vfio/pci: Handle host oversight, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 18/19] vfio/pci: Fix vfio_rtl8168_quirk_data_read address offset, Alex Williamson, 2016/10/17
- [Qemu-devel] [PULL 19/19] vfio: fix duplicate function call, Alex Williamson, 2016/10/17
- Re: [Qemu-devel] [PULL 00/19] VFIO updates 2016-10-17, Peter Maydell, 2016/10/18