Commit 5b31c822 authored by Alex Williamson's avatar Alex Williamson
Browse files

vfio/pci: Do not unwind on error 



If vfio_add_std_cap() errors then going to out prepends irrelevant
errors for capabilities we haven't attempted to add as we unwind our
recursive stack.  Just return error.

Fixes: 7ef165b9 ("vfio/pci: Pass an error object to vfio_add_capabilities")
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent d147f7e8

hw/vfio/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -1826,7 +1826,7 @@ static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos, Error **errp) 
    if (next) {

        ret = vfio_add_std_cap(vdev, next, errp);

        if (ret) {

            goto out;

            return ret;

        }

    } else {

        /* Begin the rebuild, use QEMU emulated list bits */
@@ -1862,7 +1862,7 @@ static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos, Error **errp) 
        ret = pci_add_capability(pdev, cap_id, pos, size, errp);

        break;

    }

out:



    if (ret < 0) {

        error_prepend(errp,

                      "failed to add PCI capability 0x%x[0x%x]@0x%x: ",