diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-05 10:23:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-05 10:23:12 +0100 |
| commit | 676e844d56ccbd0937c27db7a3a06ffe271def3f (patch) | |
| tree | f9bebf39dfda09a6b94bc65d796bec08144b1bf1 | |
| parent | 42e0d60f1615ef63d16e41bb1668805560c37870 (diff) | |
| parent | 0968c91ce00f42487fb11de5da38e53b5dc6bc7f (diff) | |
| download | qemu-676e844d56ccbd0937c27db7a3a06ffe271def3f.tar.gz | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/xen/xen_pt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index f593b046e5..b6d71bb52a 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -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; } |