From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: Re: [PATCH 5/6] xen/pass-through: log errno values rather than function return ones Date: Tue, 16 Jun 2015 15:23:29 +0100 Message-ID: References: <5571AA3B020000780008152E@mail.emea.novell.com> <5571AC62020000780008156F@mail.emea.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z4rmv-0005YU-7X for xen-devel@lists.xenproject.org; Tue, 16 Jun 2015 14:24:29 +0000 In-Reply-To: <5571AC62020000780008156F@mail.emea.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich Cc: xen-devel , qemu-devel@nongnu.org, Stefano Stabellini List-Id: xen-devel@lists.xenproject.org On Fri, 5 Jun 2015, Jan Beulich wrote: > Functions setting errno commonly return just -1, which is of no > particular use in the log file. > > Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini > --- a/qemu/upstream/hw/xen/xen_pt.c > +++ b/qemu/upstream/hw/xen/xen_pt.c > @@ -609,8 +609,8 @@ static void xen_pt_region_update(XenPCIP > guest_port, machine_port, size, > op); > if (rc) { > - XEN_PT_ERR(d, "%s ioport mapping failed! (rc: %i)\n", > - adding ? "create new" : "remove old", rc); > + XEN_PT_ERR(d, "%s ioport mapping failed! (err: %i)\n", > + adding ? "create new" : "remove old", errno); > } > } else { > pcibus_t guest_addr = sec->offset_within_address_space; > @@ -623,8 +623,8 @@ static void xen_pt_region_update(XenPCIP > XEN_PFN(size + XC_PAGE_SIZE - 1), > op); > if (rc) { > - XEN_PT_ERR(d, "%s mem mapping failed! (rc: %i)\n", > - adding ? "create new" : "remove old", rc); > + XEN_PT_ERR(d, "%s mem mapping failed! (err: %i)\n", > + adding ? "create new" : "remove old", errno); > } > } > } > @@ -738,8 +738,8 @@ static int xen_pt_initfn(PCIDevice *d) > rc = xc_physdev_map_pirq(xen_xc, xen_domid, machine_irq, &pirq); > > if (rc < 0) { > - XEN_PT_ERR(d, "Mapping machine irq %u to pirq %i failed, (rc: %d)\n", > - machine_irq, pirq, rc); > + 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; > @@ -760,8 +760,8 @@ static int xen_pt_initfn(PCIDevice *d) > PCI_SLOT(d->devfn), > e_intx); > if (rc < 0) { > - XEN_PT_ERR(d, "Binding of interrupt %i failed! (rc: %d)\n", > - e_intx, rc); > + 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; > @@ -770,7 +770,7 @@ static int xen_pt_initfn(PCIDevice *d) > if (xen_pt_mapped_machine_irq[machine_irq] == 0) { > if (xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq)) { > 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; > @@ -808,9 +808,9 @@ static void xen_pt_unregister_device(PCI > 0 /* isa_irq */); > if (rc < 0) { > 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", > - 'a' + intx, machine_irq, rc); > + 'a' + intx, machine_irq, errno); > } > } > > @@ -828,9 +828,9 @@ static void xen_pt_unregister_device(PCI > rc = xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq); > > 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", > - machine_irq, rc); > + machine_irq, errno); > } > } > } > --- a/qemu/upstream/hw/xen/xen_pt_msi.c > +++ b/qemu/upstream/hw/xen/xen_pt_msi.c > @@ -133,8 +133,8 @@ static int msi_msix_setup(XenPCIPassthro > msix_entry, table_base); > if (rc) { > XEN_PT_ERR(&s->dev, > - "Mapping of MSI%s (rc: %i, vec: %#x, entry %#x)\n", > - is_msix ? "-X" : "", rc, gvec, msix_entry); > + "Mapping of MSI%s (err: %i, vec: %#x, entry %#x)\n", > + is_msix ? "-X" : "", errno, gvec, msix_entry); > return rc; > } > } > @@ -167,12 +167,12 @@ static int msi_msix_update(XenPCIPassthr > pirq, gflags, table_addr); > > if (rc) { > - XEN_PT_ERR(d, "Updating of MSI%s failed. (rc: %d)\n", > - is_msix ? "-X" : "", rc); > + XEN_PT_ERR(d, "Updating of MSI%s failed. (err: %d)\n", > + is_msix ? "-X" : "", errno); > > if (xc_physdev_unmap_pirq(xen_xc, xen_domid, *old_pirq)) { > - XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed.\n", > - is_msix ? "-X" : "", *old_pirq); > + XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed. (err: %d)\n", > + is_msix ? "-X" : "", *old_pirq, errno); > } > *old_pirq = XEN_PT_UNASSIGNED_PIRQ; > } > @@ -200,8 +200,8 @@ static int msi_msix_disable(XenPCIPassth > is_msix ? "-X" : "", pirq, gvec); > rc = xc_domain_unbind_msi_irq(xen_xc, xen_domid, gvec, pirq, gflags); > if (rc) { > - XEN_PT_ERR(d, "Unbinding of MSI%s failed. (pirq: %d, gvec: %#x)\n", > - is_msix ? "-X" : "", pirq, gvec); > + XEN_PT_ERR(d, "Unbinding of MSI%s failed. (err: %d, pirq: %d, gvec: %#x)\n", > + is_msix ? "-X" : "", errno, pirq, gvec); > return rc; > } > } > @@ -209,8 +209,8 @@ static int msi_msix_disable(XenPCIPassth > XEN_PT_LOG(d, "Unmap MSI%s pirq %d\n", is_msix ? "-X" : "", pirq); > rc = xc_physdev_unmap_pirq(xen_xc, xen_domid, pirq); > if (rc) { > - XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed. (rc: %i)\n", > - is_msix ? "-X" : "", pirq, rc); > + XEN_PT_ERR(d, "Unmapping of MSI%s pirq %d failed. (err: %i)\n", > + is_msix ? "-X" : "", pirq, errno); > return rc; > } > > @@ -410,8 +410,8 @@ int xen_pt_msix_update_remap(XenPCIPasst > ret = xc_domain_unbind_pt_irq(xen_xc, xen_domid, entry->pirq, > PT_IRQ_TYPE_MSI, 0, 0, 0, 0); > if (ret) { > - XEN_PT_ERR(&s->dev, "unbind MSI-X entry %d failed\n", > - entry->pirq); > + XEN_PT_ERR(&s->dev, "unbind MSI-X entry %d failed (err: %d)\n", > + entry->pirq, errno); > } > entry->updated = true; > } > > >