[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 08/17] vfio: Pass an Error object to vfio_connect
From: |
Eric Auger |
Subject: |
[Qemu-devel] [PATCH v4 08/17] vfio: Pass an Error object to vfio_connect_container |
Date: |
Mon, 3 Oct 2016 12:41:08 +0000 |
The error is currently simply reported in vfio_get_group. Don't
bother too much with the prefix which will be handled at upper level,
later on.
Signed-off-by: Eric Auger <address@hidden>
---
hw/vfio/common.c | 39 ++++++++++++++++++++++++---------------
1 file changed, 24 insertions(+), 15 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 29188a1..3b18eb4 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -34,6 +34,7 @@
#include "qemu/range.h"
#include "sysemu/kvm.h"
#include "trace.h"
+#include "qapi/error.h"
struct vfio_group_head vfio_group_list =
QLIST_HEAD_INITIALIZER(vfio_group_list);
@@ -900,7 +901,8 @@ static void vfio_put_address_space(VFIOAddressSpace *space)
}
}
-static int vfio_connect_container(VFIOGroup *group, AddressSpace *as)
+static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
+ Error **errp)
{
VFIOContainer *container;
int ret, fd;
@@ -918,15 +920,15 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
fd = qemu_open("/dev/vfio/vfio", O_RDWR);
if (fd < 0) {
- error_report("vfio: failed to open /dev/vfio/vfio: %m");
+ error_setg_errno(errp, errno, "failed to open /dev/vfio/vfio");
ret = -errno;
goto put_space_exit;
}
ret = ioctl(fd, VFIO_GET_API_VERSION);
if (ret != VFIO_API_VERSION) {
- error_report("vfio: supported vfio version: %d, "
- "reported version: %d", VFIO_API_VERSION, ret);
+ error_setg(errp, "supported vfio version: %d, "
+ "reported version: %d", VFIO_API_VERSION, ret);
ret = -EINVAL;
goto close_fd_exit;
}
@@ -941,7 +943,7 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
ret = ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, &fd);
if (ret) {
- error_report("vfio: failed to set group container: %m");
+ error_setg_errno(errp, errno, "failed to set group container");
ret = -errno;
goto free_container_exit;
}
@@ -949,7 +951,7 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
container->iommu_type = v2 ? VFIO_TYPE1v2_IOMMU : VFIO_TYPE1_IOMMU;
ret = ioctl(fd, VFIO_SET_IOMMU, container->iommu_type);
if (ret) {
- error_report("vfio: failed to set iommu for container: %m");
+ error_setg_errno(errp, errno, "failed to set iommu for container");
ret = -errno;
goto free_container_exit;
}
@@ -976,7 +978,7 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
ret = ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, &fd);
if (ret) {
- error_report("vfio: failed to set group container: %m");
+ error_setg_errno(errp, errno, "failed to set group container");
ret = -errno;
goto free_container_exit;
}
@@ -984,7 +986,7 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
v2 ? VFIO_SPAPR_TCE_v2_IOMMU : VFIO_SPAPR_TCE_IOMMU;
ret = ioctl(fd, VFIO_SET_IOMMU, container->iommu_type);
if (ret) {
- error_report("vfio: failed to set iommu for container: %m");
+ error_setg_errno(errp, errno, "failed to set iommu for container");
ret = -errno;
goto free_container_exit;
}
@@ -997,7 +999,7 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
if (!v2) {
ret = ioctl(fd, VFIO_IOMMU_ENABLE);
if (ret) {
- error_report("vfio: failed to enable container: %m");
+ error_setg_errno(errp, errno, "failed to enable container");
ret = -errno;
goto free_container_exit;
}
@@ -1008,7 +1010,8 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
&address_space_memory);
if (container->error) {
memory_listener_unregister(&container->prereg_listener);
- error_report("vfio: RAM memory listener initialization failed
for container");
+ error_setg(errp,
+ "RAM memory listener initialization failed for container");
goto free_container_exit;
}
}
@@ -1016,7 +1019,8 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
info.argsz = sizeof(info);
ret = ioctl(fd, VFIO_IOMMU_SPAPR_TCE_GET_INFO, &info);
if (ret) {
- error_report("vfio: VFIO_IOMMU_SPAPR_TCE_GET_INFO failed: %m");
+ error_setg_errno(errp, errno,
+ "VFIO_IOMMU_SPAPR_TCE_GET_INFO failed");
ret = -errno;
if (v2) {
memory_listener_unregister(&container->prereg_listener);
@@ -1033,6 +1037,8 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
*/
ret = vfio_spapr_remove_window(container, info.dma32_window_start);
if (ret) {
+ error_setg_errno(errp, -ret,
+ "failed to remove existing window");
goto free_container_exit;
}
} else {
@@ -1043,7 +1049,7 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
0x1000);
}
} else {
- error_report("vfio: No available IOMMU models");
+ error_setg(errp, "No available IOMMU models");
ret = -EINVAL;
goto free_container_exit;
}
@@ -1054,7 +1060,8 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
if (container->error) {
ret = container->error;
- error_report("vfio: memory listener initialization failed for
container");
+ error_setg_errno(errp, -ret,
+ "memory listener initialization failed for
container");
goto listener_release_exit;
}
@@ -1120,6 +1127,7 @@ VFIOGroup *vfio_get_group(int groupid, AddressSpace *as)
VFIOGroup *group;
char path[32];
struct vfio_group_status status = { .argsz = sizeof(status) };
+ Error *err = NULL;
QLIST_FOREACH(group, &vfio_group_list, next) {
if (group->groupid == groupid) {
@@ -1158,8 +1166,9 @@ VFIOGroup *vfio_get_group(int groupid, AddressSpace *as)
group->groupid = groupid;
QLIST_INIT(&group->device_list);
- if (vfio_connect_container(group, as)) {
- error_report("vfio: failed to setup container for group %d", groupid);
+ if (vfio_connect_container(group, as, &err)) {
+ error_reportf_err(err, "vfio: failed to setup container for group %d",
+ groupid);
goto close_fd_exit;
}
--
1.9.1
- [Qemu-devel] [PATCH v4 00/17] Convert VFIO-PCI to realize, Eric Auger, 2016/10/03
- [Qemu-devel] [PATCH v4 01/17] vfio/pci: Use local error object in vfio_initfn, Eric Auger, 2016/10/03
- [Qemu-devel] [PATCH v4 02/17] vfio/pci: Pass an error object to vfio_populate_vga, Eric Auger, 2016/10/03
- [Qemu-devel] [PATCH v4 03/17] vfio/pci: Pass an error object to vfio_populate_device, Eric Auger, 2016/10/03
- [Qemu-devel] [PATCH v4 04/17] vfio/pci: Pass an error object to vfio_msix_early_setup, Eric Auger, 2016/10/03
- [Qemu-devel] [PATCH v4 05/17] vfio/pci: Pass an error object to vfio_intx_enable, Eric Auger, 2016/10/03
- [Qemu-devel] [PATCH v4 07/17] vfio/pci: Pass an error object to vfio_pci_igd_opregion_init, Eric Auger, 2016/10/03
- [Qemu-devel] [PATCH v4 08/17] vfio: Pass an Error object to vfio_connect_container,
Eric Auger <=
- [Qemu-devel] [PATCH v4 06/17] vfio/pci: Pass an error object to vfio_add_capabilities, Eric Auger, 2016/10/03
- [Qemu-devel] [PATCH v4 09/17] vfio: Pass an error object to vfio_get_group, Eric Auger, 2016/10/03
- [Qemu-devel] [PATCH v4 10/17] vfio: Pass an error object to vfio_get_device, Eric Auger, 2016/10/03
- [Qemu-devel] [PATCH v4 11/17] vfio/platform: Pass an error object to vfio_populate_device, Eric Auger, 2016/10/03
- [Qemu-devel] [PATCH v4 12/17] vfio/platform: fix a wrong returned value in vfio_populate_device, Eric Auger, 2016/10/03
- [Qemu-devel] [PATCH v4 15/17] vfio/pci: Remove vfio_msix_early_setup returned value, Eric Auger, 2016/10/03