[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/11] xen/pt: Fix flawed conversion to realize()
From: |
Markus Armbruster |
Subject: |
[PATCH 09/11] xen/pt: Fix flawed conversion to realize() |
Date: |
Mon, 20 Apr 2020 10:32:34 +0200 |
The conversion of xen_pt_initfn() to xen_pt_realize() blindly replaced
XEN_PT_ERR() by error_setg(). Several error conditions that did not
fail xen_pt_initfn() now fail xen_pt_realize(). Unsurprisingly, the
cleanup on these errors looks highly suspicious.
Revert the inappropriate replacements.
Fixes: 5a11d0f7549e24a10e178a9dc8ff5e698031d9a6
Cc: Stefano Stabellini <address@hidden>
Cc: Anthony Perard <address@hidden>
Cc: Paul Durrant <address@hidden>
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/xen/xen_pt.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index b91082cb8b..81d5ad8da7 100644
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -858,8 +858,8 @@ static void xen_pt_realize(PCIDevice *d, Error **errp)
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"
- " pirq %i failed", machine_irq, pirq);
+ XEN_PT_ERR(d, "Mapping machine irq %u to pirq %i failed, (err: %d)\n",
+ machine_irq, pirq, errno);
/* Disable PCI intx assertion (turn on bit10 of devctl) */
cmd |= PCI_COMMAND_INTX_DISABLE;
@@ -880,8 +880,8 @@ 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",
- e_intx);
+ XEN_PT_ERR(d, "Binding of interrupt %i failed! (err: %d)\n",
+ e_intx, errno);
/* Disable PCI intx assertion (turn on bit10 of devctl) */
cmd |= PCI_COMMAND_INTX_DISABLE;
@@ -889,8 +889,8 @@ static void xen_pt_realize(PCIDevice *d, Error **errp)
if (xen_pt_mapped_machine_irq[machine_irq] == 0) {
if (xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq)) {
- error_setg_errno(errp, errno, "Unmapping of machine"
- " interrupt %u failed", machine_irq);
+ XEN_PT_ERR(d, "Unmapping of machine interrupt %i failed!"
+ " (err: %d)\n", machine_irq, errno);
}
}
s->machine_irq = 0;
--
2.21.1
- [PATCH 10/11] io: Fix qio_channel_socket_close() error handling, (continued)
- [PATCH 10/11] io: Fix qio_channel_socket_close() error handling, Markus Armbruster, 2020/04/20
- [PATCH 01/11] cryptodev: Fix cryptodev_builtin_cleanup() error API violation, Markus Armbruster, 2020/04/20
- [PATCH 02/11] block/file-posix: Fix check_cache_dropped() error handling, Markus Armbruster, 2020/04/20
- [PATCH 04/11] cpus: Proper range-checking for -icount shift=N, Markus Armbruster, 2020/04/20
- [PATCH 07/11] bochs-display: Fix vgamem=SIZE error handling, Markus Armbruster, 2020/04/20
- [PATCH 08/11] virtio-net: Fix duplex=... and speed=... error handling, Markus Armbruster, 2020/04/20
- [PATCH 09/11] xen/pt: Fix flawed conversion to realize(),
Markus Armbruster <=
- Re: [PATCH 00/11] Miscellaneous error handling fixes, no-reply, 2020/04/20