From: Julien Grall <julien.grall@citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Julien Grall <julien.grall@citrix.com>,
netdev@vger.kernel.org, Wei Liu <wei.liu2@citrix.com>,
linux-kernel@vger.kernel.org,
Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH v4 3/3] net/xen-netback: Don't mix hexa and decimal with 0x in the printf format
Date: Tue, 16 Jun 2015 20:10:48 +0100 [thread overview]
Message-ID: <1434481848-26387-4-git-send-email-julien.grall__28558.0380623744$1434482029$gmane$org@citrix.com> (raw)
In-Reply-To: <1434481848-26387-1-git-send-email-julien.grall@citrix.com>
Append 0x to all %x in order to avoid while reading when there is other
decimal value in the log.
Also replace some of the hexadecimal print to decimal to uniformize the
format with netfront.
Signed-off-by: Julien Grall <julien.grall@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: netdev@vger.kernel.org
---
Changes in v4:
- Patch added
---
drivers/net/xen-netback/netback.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index ba3ae30..11bd9d8 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -748,7 +748,7 @@ static int xenvif_count_requests(struct xenvif_queue *queue,
slots++;
if (unlikely((txp->offset + txp->size) > PAGE_SIZE)) {
- netdev_err(queue->vif->dev, "Cross page boundary, txp->offset: %x, size: %u\n",
+ netdev_err(queue->vif->dev, "Cross page boundary, txp->offset: %u, size: %u\n",
txp->offset, txp->size);
xenvif_fatal_tx_err(queue->vif);
return -EINVAL;
@@ -874,7 +874,7 @@ static inline void xenvif_grant_handle_set(struct xenvif_queue *queue,
if (unlikely(queue->grant_tx_handle[pending_idx] !=
NETBACK_INVALID_HANDLE)) {
netdev_err(queue->vif->dev,
- "Trying to overwrite active handle! pending_idx: %x\n",
+ "Trying to overwrite active handle! pending_idx: 0x%x\n",
pending_idx);
BUG();
}
@@ -887,7 +887,7 @@ static inline void xenvif_grant_handle_reset(struct xenvif_queue *queue,
if (unlikely(queue->grant_tx_handle[pending_idx] ==
NETBACK_INVALID_HANDLE)) {
netdev_err(queue->vif->dev,
- "Trying to unmap invalid handle! pending_idx: %x\n",
+ "Trying to unmap invalid handle! pending_idx: 0x%x\n",
pending_idx);
BUG();
}
@@ -1243,7 +1243,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue,
/* No crossing a page as the payload mustn't fragment. */
if (unlikely((txreq.offset + txreq.size) > PAGE_SIZE)) {
netdev_err(queue->vif->dev,
- "txreq.offset: %x, size: %u, end: %lu\n",
+ "txreq.offset: %u, size: %u, end: %lu\n",
txreq.offset, txreq.size,
(unsigned long)(txreq.offset&~PAGE_MASK) + txreq.size);
xenvif_fatal_tx_err(queue->vif);
@@ -1593,12 +1593,12 @@ static inline void xenvif_tx_dealloc_action(struct xenvif_queue *queue)
queue->pages_to_unmap,
gop - queue->tx_unmap_ops);
if (ret) {
- netdev_err(queue->vif->dev, "Unmap fail: nr_ops %tx ret %d\n",
+ netdev_err(queue->vif->dev, "Unmap fail: nr_ops %tu ret %d\n",
gop - queue->tx_unmap_ops, ret);
for (i = 0; i < gop - queue->tx_unmap_ops; ++i) {
if (gop[i].status != GNTST_okay)
netdev_err(queue->vif->dev,
- " host_addr: %llx handle: %x status: %d\n",
+ " host_addr: 0x%llx handle: 0x%x status: %d\n",
gop[i].host_addr,
gop[i].handle,
gop[i].status);
@@ -1731,7 +1731,7 @@ void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx)
&queue->mmap_pages[pending_idx], 1);
if (ret) {
netdev_err(queue->vif->dev,
- "Unmap fail: ret: %d pending_idx: %d host_addr: %llx handle: %x status: %d\n",
+ "Unmap fail: ret: %d pending_idx: %d host_addr: %llx handle: 0x%x status: %d\n",
ret,
pending_idx,
tx_unmap_op.host_addr,
--
2.1.4
next prev parent reply other threads:[~2015-06-16 19:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1434481848-26387-1-git-send-email-julien.grall@citrix.com>
2015-06-16 19:10 ` [PATCH v4 1/3] net/xen-netfront: Correct printf format in xennet_get_responses Julien Grall
2015-06-16 19:10 ` [PATCH v4 2/3] net/xen-netback: Remove unused code in xenvif_rx_action Julien Grall
2015-06-16 19:10 ` Julien Grall [this message]
[not found] ` <1434481848-26387-4-git-send-email-julien.grall@citrix.com>
2015-06-16 20:07 ` [PATCH v4 3/3] net/xen-netback: Don't mix hexa and decimal with 0x in the printf format Sergei Shtylyov
[not found] ` <5580821D.4080408@cogentembedded.com>
2015-06-16 22:09 ` Joe Perches
[not found] ` <1434492550.2689.8.camel@perches.com>
2015-06-16 22:29 ` Sergei Shtylyov
[not found] ` <5580A33C.4040007@cogentembedded.com>
2015-06-16 23:55 ` Joe Perches
[not found] ` <1434498919.2689.35.camel@perches.com>
2015-06-17 8:54 ` Ian Campbell
2015-06-17 9:13 ` Jan Beulich
2015-06-17 9:25 ` Ian Campbell
[not found] ` <1434533143.13744.273.camel@citrix.com>
2015-06-17 9:30 ` Julien Grall
[not found] ` <55813E3F.8030602@citrix.com>
2015-06-17 9:37 ` Ian Campbell
2015-06-21 16:41 ` David Miller
[not found] ` <1434481848-26387-2-git-send-email-julien.grall@citrix.com>
2015-06-21 16:41 ` [PATCH v4 1/3] net/xen-netfront: Correct printf format in xennet_get_responses David Miller
[not found] ` <1434481848-26387-3-git-send-email-julien.grall@citrix.com>
2015-06-21 16:41 ` [PATCH v4 2/3] net/xen-netback: Remove unused code in xenvif_rx_action David Miller
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='1434481848-26387-4-git-send-email-julien.grall__28558.0380623744$1434482029$gmane$org@citrix.com' \
--to=julien.grall@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=wei.liu2@citrix.com \
--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).