diff mbox

[14/16] pci-assign: propagate errors from assign_device()

Message ID 1397118285-11715-15-git-send-email-lersek@redhat.com
State New
Headers show

Commit Message

Laszlo Ersek April 10, 2014, 8:24 a.m. UTC 
Also, change the return type to "void"; the function is static (with a
sole caller) and the negative errno values are not distinguished from each
other.

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 hw/i386/kvm/pci-assign.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

Comments

Eric Blake April 29, 2014, 7:28 p.m. UTC | #1 
On 04/10/2014 02:24 AM, Laszlo Ersek wrote:
> Also, change the return type to "void"; the function is static (with a
> sole caller) and the negative errno values are not distinguished from each
> other.
> 
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  hw/i386/kvm/pci-assign.c | 29 +++++++++++++++--------------
>  1 file changed, 15 insertions(+), 14 deletions(-)
> 

>      if (!kvm_check_extension(kvm_state, KVM_CAP_PCI_SEGMENT) &&
>          dev->host.domain) {
> -        error_report("Can't assign device inside non-zero PCI segment "
> -                     "as this KVM module doesn't support it.");
> -        return -ENODEV;
> +        error_setg(errp, "Can't assign device inside non-zero PCI segment "
> +                   "as this KVM module doesn't support it.");

We prefer avoiding trailing '.' in error messages; as long as you are
touching this, you could clean it up.  Not necessarily worth a respin on
its own; depends on what a maintainer will say.

Reviewed-by: Eric Blake <eblake@redhat.com>
diff mbox

Patch

diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index 9aa92a1..0fedca8 100644
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -793,27 +793,27 @@  static char *assign_failed_examine(const AssignedDevice *dev)
 
 fail:
     return g_strdup("Couldn't find out why.");
 }
 
-static int assign_device(AssignedDevice *dev)
+static void assign_device(AssignedDevice *dev, Error **errp)
 {
     uint32_t flags = KVM_DEV_ASSIGN_ENABLE_IOMMU;
     int r;
 
     /* Only pass non-zero PCI segment to capable module */
     if (!kvm_check_extension(kvm_state, KVM_CAP_PCI_SEGMENT) &&
         dev->host.domain) {
-        error_report("Can't assign device inside non-zero PCI segment "
-                     "as this KVM module doesn't support it.");
-        return -ENODEV;
+        error_setg(errp, "Can't assign device inside non-zero PCI segment "
+                   "as this KVM module doesn't support it.");
+        return;
     }
 
     if (!kvm_check_extension(kvm_state, KVM_CAP_IOMMU)) {
-        error_report("No IOMMU found.  Unable to assign device \"%s\"",
-                     dev->dev.qdev.id);
-        return -ENODEV;
+        error_setg(errp, "No IOMMU found.  Unable to assign device \"%s\"",
+                   dev->dev.qdev.id);
+        return;
     }
 
     if (dev->features & ASSIGNED_DEVICE_SHARE_INTX_MASK &&
         kvm_has_intx_set_mask()) {
         flags |= KVM_DEV_ASSIGN_PCI_2_3;
@@ -824,22 +824,21 @@  static int assign_device(AssignedDevice *dev)
         switch (r) {
         case -EBUSY: {
             char *cause;
 
             cause = assign_failed_examine(dev);
-            error_report("Failed to assign device \"%s\" : %s\n%s",
-                         dev->dev.qdev.id, strerror(-r), cause);
+            error_setg_errno(errp, -r, "Failed to assign device \"%s\"\n%s",
+                             dev->dev.qdev.id, cause);
             g_free(cause);
             break;
         }
         default:
-            error_report("Failed to assign device \"%s\" : %s",
-                         dev->dev.qdev.id, strerror(-r));
+            error_setg_errno(errp, -r, "Failed to assign device \"%s\"",
+                             dev->dev.qdev.id);
             break;
         }
     }
-    return r;
 }
 
 static void verify_irqchip_in_kernel(Error **errp)
 {
     if (kvm_irqchip_in_kernel()) {
@@ -1810,12 +1809,14 @@  static int assigned_initfn(struct PCIDevice *pci_dev)
     dev->intpin = e_intx;
     dev->intx_route.mode = PCI_INTX_DISABLED;
     dev->intx_route.irq = -1;
 
     /* assign device to guest */
-    r = assign_device(dev);
-    if (r < 0) {
+    assign_device(dev, &local_err);
+    if (local_err) {
+        qerror_report_err(local_err);
+        error_free(local_err);
         goto out;
     }
 
     /* assign legacy INTx to the device */
     r = assign_intx(dev);