Re: [Xen-devel] [PATCH 5/6] xen/pass-through: log errno values rather than function return ones

2015-06-16 Thread Stefano Stabellini 
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 jbeul...@suse.com

Reviewed-by: Stefano Stabellini stefano.stabell...@eu.citrix.com


 --- 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

[Xen-devel] [PATCH 5/6] xen/pass-through: log errno values rather than function return ones

2015-06-05 Thread Jan Beulich 
Functions setting errno commonly return just -1, which is of no
particular use in the log file.

Signed-off-by: Jan Beulich jbeul...@suse.com

--- 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);
 }