From: Zhao Yan <yan.y.zhao@intel.com>
To: qemu-devel@nongnu.org, sstabellini@kernel.org,
anthony.perard@citrix.com, xen-devel@lists.xenproject.org
Cc: Zhao Yan <yan.y.zhao@intel.com>
Subject: [Qemu-devel] [PATCH] Xen PCI passthrough: fix passthrough failure when irq map failure
Date: Mon, 15 Oct 2018 22:14:39 -0400 [thread overview]
Message-ID: <20181016021439.6212-1-yan.y.zhao@intel.com> (raw)
Commit 5a11d0f7 mistakenly converted a log message into an error
condition when irq map is failed for the pci device being
passed through. Revert that part of the commit.
Signed-off-by: Zhao Yan <yan.y.zhao@intel.com>
---
hw/xen/xen_pt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index e5a6eff44f..840fd0f748 100644
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -849,7 +849,7 @@ static void xen_pt_realize(PCIDevice *d, Error **errp)
machine_irq = s->real_device.irq;
rc = xc_physdev_map_pirq(xen_xc, xen_domid, machine_irq, &pirq);
if (rc < 0) {
- error_setg_errno(errp, errno, "Mapping machine irq %u to"
+ XEN_PT_ERR(d, "Mapping machine irq %u to"
" pirq %i failed", machine_irq, pirq);
/* Disable PCI intx assertion (turn on bit10 of devctl) */
@@ -871,7 +871,7 @@ static void xen_pt_realize(PCIDevice *d, Error **errp)
PCI_SLOT(d->devfn),
e_intx);
if (rc < 0) {
- error_setg_errno(errp, errno, "Binding of interrupt %u failed",
+ XEN_PT_ERR(d, "Binding of interrupt %u failed",
e_intx);
/* Disable PCI intx assertion (turn on bit10 of devctl) */
--
2.17.1
next reply other threads:[~2018-10-16 2:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-16 2:14 Zhao Yan [this message]
2018-10-18 8:22 ` [Qemu-devel] [PATCH] Xen PCI passthrough: fix passthrough failure when irq map failure Zhao, Yan Y
2018-10-18 14:56 ` Roger Pau Monné
2018-11-22 13:11 ` Zhao Yan
2018-11-22 14:18 ` Roger Pau Monné
2018-11-23 5:04 ` Zhao Yan
2018-11-23 10:19 ` Roger Pau Monné
2018-11-23 10:26 ` Jan Beulich
2018-11-26 1:58 ` Zhao Yan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181016021439.6212-1-yan.y.zhao@intel.com \
--to=yan.y.zhao@intel.com \
--cc=anthony.perard@citrix.com \
--cc=qemu-devel@nongnu.org \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).