OpenSM: More conversion to (unsiged) decimal lid format Signed-off-by: Hal Rosenstock --- diff --git a/opensm/opensm/osm_perfmgr.c b/opensm/opensm/osm_perfmgr.c index 18a63b6..8d292ab 100644 --- a/opensm/opensm/osm_perfmgr.c +++ b/opensm/opensm/osm_perfmgr.c @@ -533,7 +533,7 @@ __osm_perfmgr_query_counters(cl_map_item_t * const p_map_item, void *context) gettimeofday(&(mad_context.perfmgr_context.query_start), NULL); #endif OSM_LOG(pm->log, OSM_LOG_VERBOSE, "Getting stats for node 0x%" - PRIx64 " port %d (lid %X) (%s)\n", node_guid, port, + PRIx64 " port %d (lid %u) (%s)\n", node_guid, port, cl_ntoh16(lid), node->print_desc); status = osm_perfmgr_send_pc_mad(pm, lid, remote_qp, port, diff --git a/opensm/opensm/osm_sa_guidinfo_record.c b/opensm/opensm/osm_sa_guidinfo_record.c index 1848bc1..844b96a 100644 --- a/opensm/opensm/osm_sa_guidinfo_record.c +++ b/opensm/opensm/osm_sa_guidinfo_record.c @@ -95,7 +95,7 @@ __osm_gir_rcv_new_gir(IN osm_sa_t * sa, } OSM_LOG(sa->p_log, OSM_LOG_DEBUG, - "New GUIDInfoRecord: lid 0x%X, block num %d\n", + "New GUIDInfoRecord: lid %u, block num %d\n", cl_ntoh16(match_lid), block_num); memset(p_rec_item, 0, sizeof(*p_rec_item)); diff --git a/opensm/opensm/osm_sa_lft_record.c b/opensm/opensm/osm_sa_lft_record.c index 9589cac..e1fe8d5 100644 --- a/opensm/opensm/osm_sa_lft_record.c +++ b/opensm/opensm/osm_sa_lft_record.c @@ -90,7 +90,7 @@ __osm_lftr_rcv_new_lftr(IN osm_sa_t * sa, OSM_LOG(sa->p_log, OSM_LOG_DEBUG, "New LinearForwardingTable: sw 0x%016" PRIx64 - "\n\t\t\t\tblock 0x%02X lid 0x%02X\n", + "\n\t\t\t\tblock 0x%02X lid %u\n", cl_ntoh64(osm_node_get_node_guid(p_sw->p_node)), block, cl_ntoh16(lid)); diff --git a/opensm/opensm/osm_sa_link_record.c b/opensm/opensm/osm_sa_link_record.c index 84dad6b..9b1ad90 100644 --- a/opensm/opensm/osm_sa_link_record.c +++ b/opensm/opensm/osm_sa_link_record.c @@ -75,10 +75,10 @@ __osm_lr_rcv_build_physp_link(IN osm_sa_t * sa, if (p_lr_item == NULL) { OSM_LOG(sa->p_log, OSM_LOG_ERROR, "ERR 1801: " "Unable to acquire link record\n" - "\t\t\t\tFrom port 0x%u\n" - "\t\t\t\tTo port 0x%u\n" - "\t\t\t\tFrom lid 0x%X\n" - "\t\t\t\tTo lid 0x%X\n", + "\t\t\t\tFrom port %u\n" + "\t\t\t\tTo port %u\n" + "\t\t\t\tFrom lid %u\n" + "\t\t\t\tTo lid %u\n", from_port, to_port, cl_ntoh16(from_lid), cl_ntoh16(to_lid)); return; diff --git a/opensm/opensm/osm_sa_mft_record.c b/opensm/opensm/osm_sa_mft_record.c index 06d2538..a0453a3 100644 --- a/opensm/opensm/osm_sa_mft_record.c +++ b/opensm/opensm/osm_sa_mft_record.c @@ -92,7 +92,7 @@ __osm_mftr_rcv_new_mftr(IN osm_sa_t * sa, OSM_LOG(sa->p_log, OSM_LOG_DEBUG, "New MulticastForwardingTable: sw 0x%016" PRIx64 - "\n\t\t\t\tblock %u position %u lid 0x%02X\n", + "\n\t\t\t\tblock %u position %u lid %u\n", cl_ntoh64(osm_node_get_node_guid(p_sw->p_node)), block, position, cl_ntoh16(lid)); diff --git a/opensm/opensm/osm_sa_node_record.c b/opensm/opensm/osm_sa_node_record.c index a18d0ef..54689da 100644 --- a/opensm/opensm/osm_sa_node_record.c +++ b/opensm/opensm/osm_sa_node_record.c @@ -90,7 +90,7 @@ __osm_nr_rcv_new_nr(IN osm_sa_t * sa, OSM_LOG(sa->p_log, OSM_LOG_DEBUG, "New NodeRecord: node 0x%016" PRIx64 - "\n\t\t\t\tport 0x%016" PRIx64 ", lid 0x%X\n", + "\n\t\t\t\tport 0x%016" PRIx64 ", lid %u\n", cl_ntoh64(osm_node_get_node_guid(p_node)), cl_ntoh64(port_guid), cl_ntoh16(lid)); diff --git a/opensm/opensm/osm_sa_pkey_record.c b/opensm/opensm/osm_sa_pkey_record.c index f7f933b..bba01b4 100644 --- a/opensm/opensm/osm_sa_pkey_record.c +++ b/opensm/opensm/osm_sa_pkey_record.c @@ -93,7 +93,7 @@ __osm_sa_pkey_create(IN osm_sa_t * sa, OSM_LOG(sa->p_log, OSM_LOG_DEBUG, "New P_Key table for: port 0x%016" PRIx64 - ", lid 0x%X, port 0x%X Block:%u\n", + ", lid %u, port 0x%X Block:%u\n", cl_ntoh64(osm_physp_get_port_guid(p_physp)), cl_ntoh16(lid), osm_physp_get_port_num(p_physp), block); diff --git a/opensm/opensm/osm_sa_portinfo_record.c b/opensm/opensm/osm_sa_portinfo_record.c index afe61e1..b263ce8 100644 --- a/opensm/opensm/osm_sa_portinfo_record.c +++ b/opensm/opensm/osm_sa_portinfo_record.c @@ -94,7 +94,7 @@ __osm_pir_rcv_new_pir(IN osm_sa_t * sa, OSM_LOG(sa->p_log, OSM_LOG_DEBUG, "New PortInfoRecord: port 0x%016" PRIx64 - ", lid 0x%X, port 0x%X\n", + ", lid %u, port 0x%X\n", cl_ntoh64(osm_physp_get_port_guid(p_physp)), cl_ntoh16(lid), osm_physp_get_port_num(p_physp)); diff --git a/opensm/opensm/osm_sa_sw_info_record.c b/opensm/opensm/osm_sa_sw_info_record.c index 7dd3de7..386776f 100644 --- a/opensm/opensm/osm_sa_sw_info_record.c +++ b/opensm/opensm/osm_sa_sw_info_record.c @@ -88,7 +88,7 @@ __osm_sir_rcv_new_sir(IN osm_sa_t * sa, } OSM_LOG(sa->p_log, OSM_LOG_DEBUG, - "New SwitchInfoRecord: lid 0x%X\n", cl_ntoh16(lid)); + "New SwitchInfoRecord: lid %u\n", cl_ntoh16(lid)); memset(p_rec_item, 0, sizeof(*p_rec_item)); diff --git a/opensm/opensm/osm_sa_vlarb_record.c b/opensm/opensm/osm_sa_vlarb_record.c index 2787fc5..e2aafc1 100644 --- a/opensm/opensm/osm_sa_vlarb_record.c +++ b/opensm/opensm/osm_sa_vlarb_record.c @@ -100,7 +100,7 @@ __osm_sa_vl_arb_create(IN osm_sa_t * sa, OSM_LOG(sa->p_log, OSM_LOG_DEBUG, "New VLArbitration for: port 0x%016" PRIx64 - ", lid 0x%X, port 0x%X Block:%u\n", + ", lid %u, port 0x%X Block:%u\n", cl_ntoh64(osm_physp_get_port_guid(p_physp)), cl_ntoh16(lid), osm_physp_get_port_num(p_physp), block);