]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
vfio: Fix broken EEH
authorGavin Shan <gwshan@linux.vnet.ibm.com>
Wed, 15 Jun 2016 04:28:27 +0000 (14:28 +1000)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Fri, 5 Aug 2016 18:23:19 +0000 (13:23 -0500)
vfio_eeh_container_op() is the backend that communicates with
host kernel to support EEH functionality in QEMU. However, the
functon should return the value from host kernel instead of 0
unconditionally.

dwg: Specifically the problem occurs for the handful of EEH
sub-operations which can return a non-zero, non-error result.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Acked-by: Alex Williamson <alex.williamson@redhat.com>
[dwg: clarification to commit message]
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
(cherry picked from commit d917e88d85a147a99f38a62a4f95cac21e366d51)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/vfio/common.c

index f27db36fb3aee03736621e77cdbb10a8ac4d1a6f..e1927a5b9c25273e280ce6d997a455f1ecaaf57b 100644 (file)
@@ -1147,7 +1147,7 @@ static int vfio_eeh_container_op(VFIOContainer *container, uint32_t op)
         return -errno;
     }
 
-    return 0;
+    return ret;
 }
 
 static VFIOContainer *vfio_eeh_as_container(AddressSpace *as)