Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68946159 authored by Julien Grall's avatar Julien Grall Committed by David S. Miller
Browse files

net/xen-netback: Don't mix hexa and decimal with 0x in the printf format 



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: default avatarJulien Grall <julien.grall@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: netdev@vger.kernel.org
Acked-by: default avatarIan Campbell <ian.campbell@citrix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 44f0764c

drivers/net/xen-netback/netback.c

+7 −7
Original line number Diff line number Diff line
@@ -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,