Commit 676e844d authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20160804-tag' into staging 



Xen 2016/08/04

# gpg: Signature made Thu 04 Aug 2016 18:43:14 BST
# gpg:                using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3  0AEA 894F 8F48 70E1 AE90

* remotes/sstabellini/tags/xen-20160804-tag:
  Xen PCI passthrough: fix passthrough failure when no interrupt pin

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 42e0d60f 0968c91c

hw/xen/xen_pt.c

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ static void xen_pt_realize(PCIDevice *d, Error **errp) 
        goto err_out;

    }

    if (!scratch) {

        error_setg(errp, "no pin interrupt");

        XEN_PT_LOG(d, "no pin interrupt\n");

        goto out;

    }