From: Eric Auger <eric.auger@redhat.com>
Date: Mon, 17 Oct 2016 16:58:00 +0000 (-0600)
Subject: vfio/platform: fix a wrong returned value in vfio_populate_device
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0d84f47bff2f98d0cea5fb27e9b62225ccebd70a;p=qemu.git

vfio/platform: fix a wrong returned value in vfio_populate_device

In case the vfio_init_intp fails we currently do not return an
error value. This patch fixes the bug. The returned value is not
explicit but in practice the error object is the one used to
report the error to the end-user and the actual returned error
value is not used.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---

diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index 1a35da04c3..484e31f233 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -508,6 +508,7 @@ static int vfio_populate_device(VFIODevice *vbasedev, Error **errp)
                                                     irq.flags);
             intp = vfio_init_intp(vbasedev, irq, errp);
             if (!intp) {
+                ret = -1;
                 goto irq_err;
             }
         }