From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwDxK-0004ET-O5 for qemu-devel@nongnu.org; Mon, 17 Oct 2016 15:52:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwDxI-0007zm-2O for qemu-devel@nongnu.org; Mon, 17 Oct 2016 15:52:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38728) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwDxH-0007zJ-QH for qemu-devel@nongnu.org; Mon, 17 Oct 2016 15:52:15 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 093168E249 for ; Mon, 17 Oct 2016 19:52:15 +0000 (UTC) From: Alex Williamson Date: Mon, 17 Oct 2016 13:52:14 -0600 Message-ID: <20161017195210.17307.64435.stgit@gimli.home> In-Reply-To: <20161017194945.17307.78340.stgit@gimli.home> References: <20161017194945.17307.78340.stgit@gimli.home> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PULL 03/19] vfio/pci: Pass an error object to vfio_populate_device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eric Auger , Markus Armbruster From: Eric Auger Pass an error object to prepare for migration to VFIO-PCI realize. The returned value will be removed later on. The case where error recovery cannot be enabled is not converted into an error object but directly reported through error_report, as before. Populating an error instead would cause the future realize function to fail, which is not wanted. Signed-off-by: Eric Auger Reviewed-by: Markus Armbruster Signed-off-by: Alex Williamson --- hw/vfio/pci.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 9645a77..46e3cb8 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2202,28 +2202,27 @@ int vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp) return 0; } -static int vfio_populate_device(VFIOPCIDevice *vdev) +static int vfio_populate_device(VFIOPCIDevice *vdev, Error **errp) { VFIODevice *vbasedev = &vdev->vbasedev; struct vfio_region_info *reg_info; struct vfio_irq_info irq_info = { .argsz = sizeof(irq_info) }; int i, ret = -1; - Error *err = NULL; /* Sanity check device */ if (!(vbasedev->flags & VFIO_DEVICE_FLAGS_PCI)) { - error_report("vfio: Um, this isn't a PCI device"); + error_setg(errp, "this isn't a PCI device"); goto error; } if (vbasedev->num_regions < VFIO_PCI_CONFIG_REGION_INDEX + 1) { - error_report("vfio: unexpected number of io regions %u", - vbasedev->num_regions); + error_setg(errp, "unexpected number of io regions %u", + vbasedev->num_regions); goto error; } if (vbasedev->num_irqs < VFIO_PCI_MSIX_IRQ_INDEX + 1) { - error_report("vfio: unexpected number of irqs %u", vbasedev->num_irqs); + error_setg(errp, "unexpected number of irqs %u", vbasedev->num_irqs); goto error; } @@ -2235,7 +2234,7 @@ static int vfio_populate_device(VFIOPCIDevice *vdev) g_free(name); if (ret) { - error_report("vfio: Error getting region %d info: %m", i); + error_setg_errno(errp, -ret, "failed to get region %d info", i); goto error; } @@ -2245,7 +2244,7 @@ static int vfio_populate_device(VFIOPCIDevice *vdev) ret = vfio_get_region_info(vbasedev, VFIO_PCI_CONFIG_REGION_INDEX, ®_info); if (ret) { - error_report("vfio: Error getting config info: %m"); + error_setg_errno(errp, -ret, "failed to get config info"); goto error; } @@ -2263,11 +2262,10 @@ static int vfio_populate_device(VFIOPCIDevice *vdev) g_free(reg_info); if (vdev->features & VFIO_FEATURE_ENABLE_VGA) { - ret = vfio_populate_vga(vdev, &err); + ret = vfio_populate_vga(vdev, errp); if (ret) { - error_append_hint(&err, "device does not support " + error_append_hint(errp, "device does not support " "requested feature x-vga\n"); - error_reportf_err(err, ERR_PREFIX, vdev->vbasedev.name); goto error; } } @@ -2282,7 +2280,7 @@ static int vfio_populate_device(VFIOPCIDevice *vdev) } else if (irq_info.count == 1) { vdev->pci_aer = true; } else { - error_report("vfio: %s " + error_report(WARN_PREFIX "Could not enable error recovery for the device", vbasedev->name); } @@ -2565,9 +2563,9 @@ static int vfio_initfn(PCIDevice *pdev) goto error; } - ret = vfio_populate_device(vdev); + ret = vfio_populate_device(vdev, &err); if (ret) { - return ret; + goto error; } /* Get a copy of config space */