[infiniband] Use "%#lx" as format specifier for queue pair numbers

Signed-off-by: Michael Brown <mcb30@ipxe.org>

4 files changed, 12 insertions, 12 deletions

diff --git a/src/net/infiniband/ib_cm.c b/src/net/infiniband/ib_cm.c
index 265ec4e..51e7c1e 100644
--- a/src/net/infiniband/ib_cm.c
+++ b/src/net/infiniband/ib_cm.c
@@ -280,7 +280,7 @@ static void ib_cm_req_complete ( struct ib_device *ibdev,
 		qp->send.psn = ( ntohl ( rep->starting_psn ) >> 8 );
 		private_data = &rep->private_data;
 		private_data_len = sizeof ( rep->private_data );
-		DBGC ( conn, "CM %p connected to QPN %lx PSN %x\n",
+		DBGC ( conn, "CM %p connected to QPN %#lx PSN %#x\n",
 		       conn, qp->av.qpn, qp->send.psn );
 
 		/* Modify queue pair */
@@ -466,7 +466,7 @@ ib_create_conn ( struct ib_device *ibdev, struct ib_queue_pair *qp,
 	/* Add to list of connections */
 	list_add ( &conn->list, &ib_cm_conns );
 
-	DBGC ( conn, "CM %p created for IBDEV %s QPN %lx\n",
+	DBGC ( conn, "CM %p created for IBDEV %s QPN %#lx\n",
 	       conn, ibdev->name, qp->qpn );
 	DBGC ( conn, "CM %p connecting to " IB_GID_FMT " " IB_GUID_FMT "\n",
 	       conn, IB_GID_ARGS ( dgid ), IB_GUID_ARGS ( service_id ) );
diff --git a/src/net/infiniband/ib_cmrc.c b/src/net/infiniband/ib_cmrc.c
index 513c6f4..1e6bda5 100644
--- a/src/net/infiniband/ib_cmrc.c
+++ b/src/net/infiniband/ib_cmrc.c
@@ -428,7 +428,7 @@ int ib_cmrc_open ( struct interface *xfer, struct ib_device *ibdev,
 		goto err_create_qp;
 	}
 	ib_qp_set_ownerdata ( cmrc->qp, cmrc );
-	DBGC ( cmrc, "CMRC %p using QPN %lx\n", cmrc, cmrc->qp->qpn );
+	DBGC ( cmrc, "CMRC %p using QPN %#lx\n", cmrc, cmrc->qp->qpn );
 
 	/* Attach to parent interface, transfer reference (implicitly)
 	 * to our shutdown process, and return.
diff --git a/src/net/infiniband/ib_mcast.c b/src/net/infiniband/ib_mcast.c
index 1fa2fea..b7a6e8c 100644
--- a/src/net/infiniband/ib_mcast.c
+++ b/src/net/infiniband/ib_mcast.c
@@ -94,7 +94,7 @@ static void ib_mcast_complete ( struct ib_device *ibdev,
 	if ( ( rc == 0 ) && ( mad->hdr.status != htons ( IB_MGMT_STATUS_OK ) ))
 		rc = -ENOTCONN;
 	if ( rc != 0 ) {
-		DBGC ( ibdev, "IBDEV %s QPN %lx join failed: %s\n",
+		DBGC ( ibdev, "IBDEV %s QPN %#lx join failed: %s\n",
 		       ibdev->name, qp->qpn, strerror ( rc ) );
 		goto out;
 	}
@@ -102,14 +102,14 @@ static void ib_mcast_complete ( struct ib_device *ibdev,
 	/* Extract values from MAD */
 	joined = ( mad->hdr.method == IB_MGMT_METHOD_GET_RESP );
 	qkey = ntohl ( mc_member_record->qkey );
-	DBGC ( ibdev, "IBDEV %s QPN %lx %s " IB_GID_FMT " qkey %lx\n",
+	DBGC ( ibdev, "IBDEV %s QPN %#lx %s " IB_GID_FMT " qkey %lx\n",
 	       ibdev->name, qp->qpn, ( joined ? "joined" : "left" ),
 	       IB_GID_ARGS ( gid ), qkey );
 
 	/* Set queue key */
 	qp->qkey = qkey;
 	if ( ( rc = ib_modify_qp ( ibdev, qp ) ) != 0 ) {
-		DBGC ( ibdev, "IBDEV %s QPN %lx could not modify qkey: %s\n",
+		DBGC ( ibdev, "IBDEV %s QPN %#lx could not modify qkey: %s\n",
 		       ibdev->name, qp->qpn, strerror ( rc ) );
 		goto out;
 	}
@@ -147,7 +147,7 @@ int ib_mcast_join ( struct ib_device *ibdev, struct ib_queue_pair *qp,
 	union ib_mad mad;
 	int rc;
 
-	DBGC ( ibdev, "IBDEV %s QPN %lx joining " IB_GID_FMT "\n",
+	DBGC ( ibdev, "IBDEV %s QPN %#lx joining " IB_GID_FMT "\n",
 	       ibdev->name, qp->qpn, IB_GID_ARGS ( gid ) );
 
 	/* Sanity check */
@@ -160,7 +160,7 @@ int ib_mcast_join ( struct ib_device *ibdev, struct ib_queue_pair *qp,
 
 	/* Attach queue pair to multicast GID */
 	if ( ( rc = ib_mcast_attach ( ibdev, qp, gid ) ) != 0 ) {
-		DBGC ( ibdev, "IBDEV %s QPN %lx could not attach: %s\n",
+		DBGC ( ibdev, "IBDEV %s QPN %#lx could not attach: %s\n",
 		       ibdev->name, qp->qpn, strerror ( rc ) );
 		goto err_mcast_attach;
 	}
@@ -170,7 +170,7 @@ int ib_mcast_join ( struct ib_device *ibdev, struct ib_queue_pair *qp,
 	membership->madx = ib_create_madx ( ibdev, ibdev->gsi, &mad, NULL,
 					    &ib_mcast_op );
 	if ( ! membership->madx ) {
-		DBGC ( ibdev, "IBDEV %s QPN %lx could not create join "
+		DBGC ( ibdev, "IBDEV %s QPN %#lx could not create join "
 		       "transaction\n", ibdev->name, qp->qpn );
 		rc = -ENOMEM;
 		goto err_create_madx;
@@ -199,7 +199,7 @@ void ib_mcast_leave ( struct ib_device *ibdev, struct ib_queue_pair *qp,
 	union ib_mad mad;
 	int rc;
 
-	DBGC ( ibdev, "IBDEV %s QPN %lx leaving " IB_GID_FMT "\n",
+	DBGC ( ibdev, "IBDEV %s QPN %#lx leaving " IB_GID_FMT "\n",
 	       ibdev->name, qp->qpn, IB_GID_ARGS ( gid ) );
 
 	/* Sanity check */
@@ -217,7 +217,7 @@ void ib_mcast_leave ( struct ib_device *ibdev, struct ib_queue_pair *qp,
 	/* Send a single group leave MAD */
 	ib_mcast_mad ( ibdev, &membership->gid, 0, &mad );
 	if ( ( rc = ib_mi_send ( ibdev, ibdev->gsi, &mad, NULL ) ) != 0 ) {
-		DBGC ( ibdev, "IBDEV %s QPN %lx could not send leave request: "
+		DBGC ( ibdev, "IBDEV %s QPN %#lx could not send leave request: "
 		       "%s\n", ibdev->name, qp->qpn, strerror ( rc ) );
 	}
 }
diff --git a/src/net/infiniband/ib_packet.c b/src/net/infiniband/ib_packet.c
index 8d4df6d..8169925 100644
--- a/src/net/infiniband/ib_packet.c
+++ b/src/net/infiniband/ib_packet.c
@@ -234,7 +234,7 @@ int ib_pull ( struct ib_device *ibdev, struct io_buffer *iobuf,
 		} else {
 			if ( ! ( *qp = ib_find_qp_qpn ( ibdev, dest->qpn ) ) ) {
 				DBGC ( ibdev, "IBDEV %s RX for nonexistent "
-				       "QPN %lx\n", ibdev->name, dest->qpn );
+				       "QPN %#lx\n", ibdev->name, dest->qpn );
 				return -ENODEV;
 			}
 		}