falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xen/pass-through: log errno values rather than function return ones 

Functions setting errno commonly return just -1, which is of no
particular use in the log file.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
This commit is contained in:
Jan Beulich 2015-06-05 13:04:18 +01:00 committed by Stefano Stabellini
parent 69976894c1
commit 3782f60d20
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/xen/xen_pt.c
View File

@ -615,8 +615,8 @@ static void xen_pt_region_update(XenPCIPassthroughState *s,
guest_port, machine_port, size, guest_port, machine_port, size,
op); op);
if (rc) { if (rc) {
XEN_PT_ERR(d, "%s ioport mapping failed! (rc: %i)\n", XEN_PT_ERR(d, "%s ioport mapping failed! (err: %i)\n",
adding ? "create new" : "remove old", rc); adding ? "create new" : "remove old", errno);
} }
} else { } else {
pcibus_t guest_addr = sec->offset_within_address_space; pcibus_t guest_addr = sec->offset_within_address_space;
@ -629,8 +629,8 @@ static void xen_pt_region_update(XenPCIPassthroughState *s,
XEN_PFN(size + XC_PAGE_SIZE - 1), XEN_PFN(size + XC_PAGE_SIZE - 1),
op); op);
if (rc) { if (rc) {
XEN_PT_ERR(d, "%s mem mapping failed! (rc: %i)\n", XEN_PT_ERR(d, "%s mem mapping failed! (err: %i)\n",
adding ? "create new" : "remove old", rc); adding ? "create new" : "remove old", errno);
} }
} }
} }
@ -744,8 +744,8 @@ static int xen_pt_initfn(PCIDevice *d)
rc = xc_physdev_map_pirq(xen_xc, xen_domid, machine_irq, &pirq); rc = xc_physdev_map_pirq(xen_xc, xen_domid, machine_irq, &pirq);
if (rc < 0) { if (rc < 0) {
XEN_PT_ERR(d, "Mapping machine irq %u to pirq %i failed, (rc: %d)\n", XEN_PT_ERR(d, "Mapping machine irq %u to pirq %i failed, (err: %d)\n",
machine_irq, pirq, rc); machine_irq, pirq, errno);
/* Disable PCI intx assertion (turn on bit10 of devctl) */ /* Disable PCI intx assertion (turn on bit10 of devctl) */
cmd |= PCI_COMMAND_INTX_DISABLE; cmd |= PCI_COMMAND_INTX_DISABLE;
@ -766,8 +766,8 @@ static int xen_pt_initfn(PCIDevice *d)
PCI_SLOT(d->devfn), PCI_SLOT(d->devfn),
e_intx); e_intx);
if (rc < 0) { if (rc < 0) {
XEN_PT_ERR(d, "Binding of interrupt %i failed! (rc: %d)\n", XEN_PT_ERR(d, "Binding of interrupt %i failed! (err: %d)\n",
e_intx, rc); e_intx, errno);
/* Disable PCI intx assertion (turn on bit10 of devctl) */ /* Disable PCI intx assertion (turn on bit10 of devctl) */
cmd |= PCI_COMMAND_INTX_DISABLE; cmd |= PCI_COMMAND_INTX_DISABLE;
@ -776,7 +776,7 @@ static int xen_pt_initfn(PCIDevice *d)
if (xen_pt_mapped_machine_irq[machine_irq] == 0) { if (xen_pt_mapped_machine_irq[machine_irq] == 0) {
if (xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq)) { if (xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq)) {
XEN_PT_ERR(d, "Unmapping of machine interrupt %i failed!" XEN_PT_ERR(d, "Unmapping of machine interrupt %i failed!"
" (rc: %d)\n", machine_irq, rc); " (err: %d)\n", machine_irq, errno);
} }
} }
s->machine_irq = 0; s->machine_irq = 0;
@ -814,9 +814,9 @@ static void xen_pt_unregister_device(PCIDevice *d)
0 /* isa_irq */); 0 /* isa_irq */);
if (rc < 0) { if (rc < 0) {
XEN_PT_ERR(d, "unbinding of interrupt INT%c failed." XEN_PT_ERR(d, "unbinding of interrupt INT%c failed."
" (machine irq: %i, rc: %d)" " (machine irq: %i, err: %d)"
" But bravely continuing on..\n", " But bravely continuing on..\n",
'a' + intx, machine_irq, rc); 'a' + intx, machine_irq, errno);
} }
} }
@ -834,9 +834,9 @@ static void xen_pt_unregister_device(PCIDevice *d)
rc = xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq); rc = xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq);
if (rc < 0) { if (rc < 0) {
XEN_PT_ERR(d, "unmapping of interrupt %i failed. (rc: %d)" XEN_PT_ERR(d, "unmapping of interrupt %i failed. (err: %d)"
" But bravely continuing on..\n", " But bravely continuing on..\n",
machine_irq, rc); machine_irq, errno);
} }
} }
} }

24
hw/xen/xen_pt_msi.c
View File

@ -132,8 +132,8 @@ static int msi_msix_setup(XenPCIPassthroughState *s,
msix_entry, table_base); msix_entry, table_base);
if (rc) { if (rc) {
XEN_PT_ERR(&s->dev, XEN_PT_ERR(&s->dev,
"Mapping of MSI%s (rc: %i, vec: %#x, entry %#x)\n", "Mapping of MSI%s (err: %i, vec: %#x, entry %#x)\n",
is_msix ? "-X" : "", rc, gvec, msix_entry); is_msix ? "-X" : "", errno, gvec, msix_entry);
return rc; return rc;
} }
} }
@ -166,12 +166,12 @@ static int msi_msix_update(XenPCIPassthroughState *s,
pirq, gflags, table_addr); pirq, gflags, table_addr);
if (rc) { if (rc) {
XEN_PT_ERR(d, "Updating of MSI%s failed. (rc: %d)\n", XEN_PT_ERR(d, "Updating of MSI%s failed. (err: %d)\n",
is_msix ? "-X" : "", rc); is_msix ? "-X" : "", errno);
if (xc_physdev_unmap_pirq(xen_xc, xen_domid, *old_pirq)) { if (xc_physdev_unmap_pirq(xen_xc, xen_domid, *old_pirq)) {
XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed.\n", XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed. (err: %d)\n",
is_msix ? "-X" : "", *old_pirq); is_msix ? "-X" : "", *old_pirq, errno);
} }
*old_pirq = XEN_PT_UNASSIGNED_PIRQ; *old_pirq = XEN_PT_UNASSIGNED_PIRQ;
} }
@ -199,8 +199,8 @@ static int msi_msix_disable(XenPCIPassthroughState *s,
is_msix ? "-X" : "", pirq, gvec); is_msix ? "-X" : "", pirq, gvec);
rc = xc_domain_unbind_msi_irq(xen_xc, xen_domid, gvec, pirq, gflags); rc = xc_domain_unbind_msi_irq(xen_xc, xen_domid, gvec, pirq, gflags);
if (rc) { if (rc) {
XEN_PT_ERR(d, "Unbinding of MSI%s failed. (pirq: %d, gvec: %#x)\n", XEN_PT_ERR(d, "Unbinding of MSI%s failed. (err: %d, pirq: %d, gvec: %#x)\n",
is_msix ? "-X" : "", pirq, gvec); is_msix ? "-X" : "", errno, pirq, gvec);
return rc; return rc;
} }
} }
@ -208,8 +208,8 @@ static int msi_msix_disable(XenPCIPassthroughState *s,
XEN_PT_LOG(d, "Unmap MSI%s pirq %d\n", is_msix ? "-X" : "", pirq); XEN_PT_LOG(d, "Unmap MSI%s pirq %d\n", is_msix ? "-X" : "", pirq);
rc = xc_physdev_unmap_pirq(xen_xc, xen_domid, pirq); rc = xc_physdev_unmap_pirq(xen_xc, xen_domid, pirq);
if (rc) { if (rc) {
XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed. (rc: %i)\n", XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed. (err: %i)\n",
is_msix ? "-X" : "", pirq, rc); is_msix ? "-X" : "", pirq, errno);
return rc; return rc;
} }
@ -385,8 +385,8 @@ int xen_pt_msix_update_remap(XenPCIPassthroughState *s, int bar_index)
ret = xc_domain_unbind_pt_irq(xen_xc, xen_domid, entry->pirq, ret = xc_domain_unbind_pt_irq(xen_xc, xen_domid, entry->pirq,
PT_IRQ_TYPE_MSI, 0, 0, 0, 0); PT_IRQ_TYPE_MSI, 0, 0, 0, 0);
if (ret) { if (ret) {
XEN_PT_ERR(&s->dev, "unbind MSI-X entry %d failed\n", XEN_PT_ERR(&s->dev, "unbind MSI-X entry %d failed (err: %d)\n",
entry->pirq); entry->pirq, errno);
} }
entry->updated = true; entry->updated = true;
} }