From 6d9b394fcb5f71271210760b16a4dae07b894efd Mon Sep 17 00:00:00 2001 From: eitan Date: Tue, 4 Apr 2006 08:57:56 +0000 Subject: [PATCH] [OpenSM] - cosmetic changes git-svn-id: svn://openib.tc.cornell.edu/gen1@283 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/ulp/opensm/user/ibtrapgen/ibtrapgen.c | 14 +- trunk/ulp/opensm/user/osmtest/osmtest.c | 517 ++++++++++---------- 2 files changed, 265 insertions(+), 266 deletions(-) diff --git a/trunk/ulp/opensm/user/ibtrapgen/ibtrapgen.c b/trunk/ulp/opensm/user/ibtrapgen/ibtrapgen.c index 2476ce4d..fd3d787d 100644 --- a/trunk/ulp/opensm/user/ibtrapgen/ibtrapgen.c +++ b/trunk/ulp/opensm/user/ibtrapgen/ibtrapgen.c @@ -79,17 +79,17 @@ * Environment: * Linux User Mode * - * $Revision: 1.1 $ + * $Revision: 1.2 $ */ #include +#include #include #include #include -#include "ibtrapgen.h" #include -#include #include +#include "ibtrapgen.h" #define GUID_ARRAY_SIZE 64 @@ -113,7 +113,7 @@ ibtrapgen_init( IN ibtrapgen_t * const p_ibtrapgen, p_ibtrapgen->p_log = (osm_log_t *)cl_malloc(sizeof(osm_log_t)); osm_log_construct( p_ibtrapgen->p_log ); status = osm_log_init( p_ibtrapgen->p_log, p_opt->force_log_flush, - 0x0001, p_opt->log_file, TRUE ); + 0x0001, p_opt->log_file,FALSE ); if( status != IB_SUCCESS ) return ( status ); @@ -207,7 +207,7 @@ __ibtrapgen_send_err_cb( osm_log( p_ibtrapgen->p_log, OSM_LOG_ERROR, "__ibtrapgen_send_err_cb: ERR 0012: " - "We shouldn't be here!! TID:0x%" PRIx64 ".\n", + "We shouldn't be here!! TID:0x%016" PRIx64 ".\n", cl_ntoh64(p_madw->p_mad->trans_id) ); OSM_LOG_EXIT( p_ibtrapgen->p_log ); } @@ -253,7 +253,7 @@ ibtrapgen_bind( IN ibtrapgen_t * p_ibtrapgen ) for ( i = 0 ; i < num_ports ; i++ ) { - osm_log(p_ibtrapgen->p_log, OSM_LOG_DEBUG, + osm_log(p_ibtrapgen->p_log, OSM_LOG_INFO, "ibtrapgen_bind: Found port number:%u " " with GUID:0x%016"PRIx64"\n", i, cl_ntoh64(attr_array[i].port_guid) ); @@ -287,7 +287,7 @@ ibtrapgen_bind( IN ibtrapgen_t * p_ibtrapgen ) bind_info.is_report_processor = TRUE; bind_info.is_responder = TRUE; bind_info.is_trap_processor = TRUE; - bind_info.mad_class = IB_MCLASS_SUBN_DIR; + bind_info.mad_class = IB_MCLASS_SUBN_LID; bind_info.port_guid = p_ibtrapgen->port_guid; bind_info.recv_q_size = OSM_SM_DEFAULT_QP0_RCV_SIZE; bind_info.send_q_size = OSM_SM_DEFAULT_QP0_SEND_SIZE; diff --git a/trunk/ulp/opensm/user/osmtest/osmtest.c b/trunk/ulp/opensm/user/osmtest/osmtest.c index 8ea5ae38..f03fe571 100644 --- a/trunk/ulp/opensm/user/osmtest/osmtest.c +++ b/trunk/ulp/opensm/user/osmtest/osmtest.c @@ -587,7 +587,7 @@ osmtest_query_res_cb( IN osmv_query_res_t * p_rec ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_query_res_cb: ERR 0003: " - "Error on query (%s).\n", ib_get_err_str( p_rec->status ) ); + "Error on query (%s)\n", ib_get_err_str( p_rec->status ) ); } } @@ -612,11 +612,11 @@ osmtest_get_all_recs( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_get_all_recs: " - "Getting all %s records.\n", ib_get_sa_attr_str( attr_id ) ); + "Getting all %s records\n", ib_get_sa_attr_str( attr_id ) ); } /* - * Do a blocking query for all NodeRecords in the subnet. + * Do a blocking query for all records in the subnet. * The result is returned in the result field of the caller's * context structure. * @@ -644,7 +644,7 @@ osmtest_get_all_recs( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_all_recs: ERR 0004: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); goto Exit; } @@ -654,13 +654,13 @@ osmtest_get_all_recs( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_all_recs: ERR 0064: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); if( status == IB_REMOTE_ERROR ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_all_recs: " - "Remote error = %s.\n", + "Remote error = %s\n", ib_get_mad_status_str( osm_madw_get_mad_ptr ( p_context->result. p_result_madw ) ) ); @@ -719,7 +719,7 @@ osmtest_validate_sa_class_port_info( IN osmtest_t * const p_osmt) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_sa_class_port_info: ERR 0065: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); goto Exit; } @@ -731,13 +731,13 @@ osmtest_validate_sa_class_port_info( IN osmtest_t * const p_osmt) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_sa_class_port_info: ERR 0070: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); } if( status == IB_REMOTE_ERROR ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_sa_class_port_info: " - "Remote error = %s.\n", + "Remote error = %s\n", ib_get_mad_status_str( osm_madw_get_mad_ptr ( p_context->result. p_result_madw ) ) ); @@ -752,7 +752,7 @@ osmtest_validate_sa_class_port_info( IN osmtest_t * const p_osmt) osm_log( &p_osmt->log, OSM_LOG_INFO, "osmtest_validate_sa_class_port_info:\n-----------------------------\nSA Class Port Info:\n" " base_ver:%u\n class_ver:%u\n cap_mask:0x%X\n resp_time_val:0x%X\n-----------------------------\n", - p_cpi->base_ver, p_cpi->class_ver, p_cpi->cap_mask, p_cpi->resp_time_val + p_cpi->base_ver, p_cpi->class_ver, cl_ntoh16(p_cpi->cap_mask), p_cpi->resp_time_val ); Exit: @@ -786,7 +786,7 @@ osmtest_get_node_rec( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_get_node_rec: " - "Getting node record for 0x%016" PRIx64 ".\n", + "Getting node record for 0x%016" PRIx64 "\n", cl_ntoh64( node_guid ) ); } @@ -824,7 +824,7 @@ osmtest_get_node_rec( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_node_rec: ERR 0071: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); goto Exit; } @@ -836,13 +836,13 @@ osmtest_get_node_rec( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_node_rec: ERR 0072: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); } if( status == IB_REMOTE_ERROR ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_node_rec: " - "Remote error = %s.\n", + "Remote error = %s\n", ib_get_mad_status_str( osm_madw_get_mad_ptr ( p_context->result. p_result_madw ) ) ); @@ -875,7 +875,7 @@ osmtest_get_node_rec_by_lid( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_get_node_rec_by_lid: " - "Getting node record for LID 0x%02X.\n", + "Getting node record for LID 0x%02X\n", cl_ntoh16( lid ) ); } @@ -913,7 +913,7 @@ osmtest_get_node_rec_by_lid( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_node_rec_by_lid: ERR 0073: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); goto Exit; } @@ -925,14 +925,14 @@ osmtest_get_node_rec_by_lid( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_node_rec_by_lid: ERR 0074: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); } if( status == IB_REMOTE_ERROR ) { p_mad = osm_madw_get_mad_ptr( p_context->result.p_result_madw ); osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_node_rec_by_lid: " - "Remote error = %s.\n", + "Remote error = %s\n", ib_get_mad_status_str( p_mad )); status = (ib_net16_t) (p_mad->status & IB_SMP_STATUS_MASK ); @@ -995,13 +995,13 @@ osmtest_get_path_rec_by_guid_pair( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_path_rec_by_guid_pair: ERR 0066: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); if( status == IB_REMOTE_ERROR ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_path_rec_by_guid_pair: " - "Remote error = %s.\n", + "Remote error = %s\n", ib_get_mad_status_str( osm_madw_get_mad_ptr ( (*p_context).result. p_result_madw ) ) ); @@ -1033,7 +1033,7 @@ osmtest_get_port_rec( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_get_port_rec: " - "Getting PortRecord for port with LID 0x%X.\n", + "Getting PortRecord for port with LID 0x%X\n", cl_ntoh16( lid ) ); } @@ -1071,7 +1071,7 @@ osmtest_get_port_rec( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_port_rec: ERR 0075: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); goto Exit; } @@ -1081,13 +1081,13 @@ osmtest_get_port_rec( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_port_rec: ERR 0076: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); if( status == IB_REMOTE_ERROR ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_port_rec: " - "Remote error = %s.\n", + "Remote error = %s\n", ib_get_mad_status_str( osm_madw_get_mad_ptr ( p_context->result. p_result_madw ) ) ); @@ -1118,7 +1118,7 @@ osmtest_get_port_rec_by_num( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_get_port_rec_by_num: " - "Getting PortRecord for port with LID 0x%X Num:0x%X.\n", + "Getting PortRecord for port with LID 0x%X Num:0x%X\n", cl_ntoh16( lid ), port_num); } @@ -1155,7 +1155,7 @@ osmtest_get_port_rec_by_num( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_port_rec_by_num: ERR 0077: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); goto Exit; } @@ -1167,7 +1167,7 @@ osmtest_get_port_rec_by_num( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_port_rec_by_num: ERR 0078: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); } if( status == IB_REMOTE_ERROR ) @@ -1175,7 +1175,7 @@ osmtest_get_port_rec_by_num( IN osmtest_t * const p_osmt, p_mad = osm_madw_get_mad_ptr( p_context->result.p_result_madw ); osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_port_rec_by_num: " - "Remote error = %s.\n", + "Remote error = %s\n", ib_get_mad_status_str( p_mad )); status = (ib_net16_t) (p_mad->status & IB_SMP_STATUS_MASK ); } @@ -1229,7 +1229,7 @@ osmtest_stress_port_recs_large( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_stress_port_recs_large: " - "Received %u records.\n", num_recs ); + "Received %u records\n", num_recs ); for( i = 0; i < num_recs; i++ ) { @@ -1296,7 +1296,7 @@ osmtest_stress_node_recs_large( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_stress_node_recs_large: " - "Received %u records.\n", num_recs ); + "Received %u records\n", num_recs ); for( i = 0; i < num_recs; i++ ) { @@ -1361,7 +1361,7 @@ osmtest_stress_path_recs_large( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_stress_path_recs_large: " - "Received %u records.\n", num_recs ); + "Received %u records\n", num_recs ); for( i = 0; i < num_recs; i++ ) { @@ -1457,7 +1457,7 @@ osmtest_stress_path_recs_by_guid ( IN osmtest_t * const p_osmt, if( osm_log_is_active( &p_osmt->log, OSM_LOG_VERBOSE ) ) osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_stress_path_recs_by_guid: " - "Received %u records.\n", num_recs ); + "Received %u records\n", num_recs ); /* Dont waste time if not VERBOSE and above */ if (p_osmt->log.level & OSM_LOG_VERBOSE) { for (i = 0; i < num_recs; i++) { @@ -1529,7 +1529,7 @@ osmtest_stress_port_recs_small( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_stress_port_recs_small: " - "Received %u records.\n", num_recs ); + "Received %u records\n", num_recs ); for( i = 0; i < num_recs; i++ ) { @@ -1568,14 +1568,13 @@ osmtest_wrong_sm_key_ignored( IN osmtest_t * const p_osmt) osmtest_req_context_t *p_context = &context; uint8_t port_num = 1; - OSM_LOG_ENTER( &p_osmt->log, osmtest_get_port_rec ); if( osm_log_is_active( &p_osmt->log, OSM_LOG_INFO ) ) { osm_log( &p_osmt->log, OSM_LOG_INFO, "osmtest_wrong_sm_key_ignored: " - "Try PortRecord for port with LID 0x%X Num:0x%X.\n", + "Try PortRecord for port with LID 0x%X Num:0x%X\n", cl_ntoh16( p_osmt->local_port.sm_lid ), port_num); } @@ -1614,7 +1613,7 @@ osmtest_wrong_sm_key_ignored( IN osmtest_t * const p_osmt) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_wrong_sm_key_ignored: ERR 0011: " - "Did not get a timeout but got (%s).\n", ib_get_err_str( status ) ); + "Did not get a timeout but got (%s)\n", ib_get_err_str( status ) ); goto Exit; } else @@ -1719,7 +1718,7 @@ osmtest_write_port_info( IN osmtest_t * const p_osmt, if( result < 0 ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_write_port_info: ERR 001: " "Write failed.\n" ); + "osmtest_write_port_info: ERR 001: " "Write failed\n" ); status = IB_ERROR; goto Exit; } @@ -1769,7 +1768,7 @@ osmtest_write_path_info( IN osmtest_t * const p_osmt, if( result < 0 ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_write_path_info: ERR 002: " "Write failed.\n" ); + "osmtest_write_path_info: ERR 002: " "Write failed\n" ); status = IB_ERROR; goto Exit; } @@ -1828,7 +1827,7 @@ osmtest_write_node_info( IN osmtest_t * const p_osmt, if( result < 0 ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_write_node_info: ERR 003: " "Write failed.\n" ); + "osmtest_write_node_info: ERR 003: " "Write failed\n" ); status = IB_ERROR; goto Exit; } @@ -1839,7 +1838,6 @@ osmtest_write_node_info( IN osmtest_t * const p_osmt, } #if 0 - /* HACK: we do not support link records for now. */ /********************************************************************** @@ -1868,7 +1866,7 @@ osmtest_write_link( IN osmtest_t * const p_osmt, if( result < 0 ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_write_link: ERR 004: " "Write failed.\n" ); + "osmtest_write_link: ERR 004: " "Write failed\n" ); status = IB_ERROR; goto Exit; } @@ -1919,7 +1917,7 @@ osmtest_write_all_link_recs( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_write_all_link_recs: " - "Received %u records.\n", num_recs ); + "Received %u records\n", num_recs ); } result = fprintf( fh, "#\n" "# Link Records\n" "#\n" ); @@ -1927,7 +1925,7 @@ osmtest_write_all_link_recs( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_write_all_link_recs: ERR 006: " - "Write failed.\n" ); + "Write failed\n" ); status = IB_ERROR; goto Exit; } @@ -2006,13 +2004,13 @@ osmtest_get_path_rec_by_lid_pair( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_path_rec_by_lid_pair: ERR 0067: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); if( status == IB_REMOTE_ERROR ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_get_path_rec_by_lid_pair: " - "Remote error = %s.\n", + "Remote error = %s\n", ib_get_mad_status_str( osm_madw_get_mad_ptr ( (*p_context).result. p_result_madw ) ) ); @@ -2069,7 +2067,7 @@ osmtest_write_all_node_recs( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_write_all_node_recs: " - "Received %u records.\n", num_recs ); + "Received %u records\n", num_recs ); } result = fprintf( fh, "#\n" "# Node Records\n" "#\n" ); @@ -2077,7 +2075,7 @@ osmtest_write_all_node_recs( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_write_all_node_recs: ERR 0023: " - "Write failed.\n" ); + "Write failed\n" ); status = IB_ERROR; goto Exit; } @@ -2144,14 +2142,14 @@ osmtest_write_all_port_recs( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_write_all_port_recs: " - "Received %u records.\n", num_recs ); + "Received %u records\n", num_recs ); } result = fprintf( fh, "#\n" "# PortInfo Records\n" "#\n" ); if( result < 0 ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_write_all_port_recs: ERR 0024: " "Write failed.\n" ); + "osmtest_write_all_port_recs: ERR 0024: " "Write failed\n" ); status = IB_ERROR; goto Exit; } @@ -2219,7 +2217,7 @@ osmtest_write_all_path_recs( { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_write_all_path_recs: " - "Received %u records.\n", num_recs ); + "Received %u records\n", num_recs ); } result = fprintf( fh, "#\n" "# Path Records\n" "#\n" ); @@ -2227,7 +2225,7 @@ osmtest_write_all_path_recs( { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_write_all_path_recs: ERR 0026: " - "Write failed.\n" ); + "Write failed\n" ); status = IB_ERROR; goto Exit; } @@ -2277,7 +2275,7 @@ osmtest_write_all_node_recs( { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_write_all_node_recs: ERR 0027: " - "Write failed.\n" ); + "Write failed\n" ); status = IB_ERROR; goto Exit; } @@ -2297,7 +2295,7 @@ osmtest_write_all_node_recs( { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_write_all_node_recs: ERR 0028: " - "failed to get node info for LID:0x%02X.(%s)\n", + "failed to get node info for LID:0x%02X (%s)\n", cl_ntoh16( lid ), ib_get_err_str( status ) ); goto Exit; @@ -2306,7 +2304,7 @@ osmtest_write_all_node_recs( { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_write_all_node_recs: WRN 0121: " - "failed to get node info for LID:0x%02X.(%s)\n", + "failed to get node info for LID:0x%02X (%s)\n", cl_ntoh16( lid ), ib_get_err_str( status ) ); status = IB_SUCCESS; @@ -2385,7 +2383,7 @@ osmtest_write_all_port_recs( IN osmtest_t * const p_osmt, if( result < 0 ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_write_all_port_recs: ERR 0029: " "Write failed.\n" ); + "osmtest_write_all_port_recs: ERR 0029: " "Write failed\n" ); status = IB_ERROR; goto Exit; } @@ -2418,7 +2416,7 @@ osmtest_write_all_port_recs( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_write_all_port_recs: WRN 0121: " - "Error encountered getting port info for LID:0x%04X Num:0x%02X.(%s)\n", + "Error encountered getting port info for LID:0x%04X Num:0x%02X (%s)\n", p_node_rec->lid, port_num, ib_get_err_str( status ) ); goto Exit; @@ -2427,7 +2425,7 @@ osmtest_write_all_port_recs( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_write_all_port_recs: WRN 0121: " - "failed to get port info for LID:0x%04X Num:0x%02X.(%s)\n", + "failed to get port info for LID:0x%04X Num:0x%02X (%s)\n", p_node_rec->lid, port_num, ib_get_err_str( status ) ); status = IB_SUCCESS; @@ -2524,7 +2522,7 @@ osmtest_write_all_path_recs( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_write_all_path_recs: WRN 0121: " - "failed to get path info from LID:0x%X To LID:0x%X.(%s)\n", + "failed to get path info from LID:0x%X To LID:0x%X (%s)\n", p_src_node->rec.lid, p_dst_node->rec.lid, ib_get_err_str( status ) ); } @@ -2583,7 +2581,7 @@ osmtest_create_inventory_file( IN osmtest_t * const p_osmt ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_create_inventory_file: ERR 0079: " - "Unable to open inventory file (%s).\n" ); + "Unable to open inventory file (%s)\n" ); status = IB_ERROR; goto Exit; } @@ -2903,7 +2901,7 @@ osmtest_check_missing_nodes( IN osmtest_t * const p_osmt ) */ osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_check_missing_nodes: ERR 0080: " - "Missing node 0x%016" PRIx64 ".\n", + "Missing node 0x%016" PRIx64 "\n", cl_ntoh64( p_node->rec.node_info.node_guid ) ); status = IB_ERROR; } @@ -2939,7 +2937,7 @@ osmtest_check_missing_ports( IN osmtest_t * const p_osmt ) */ osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_check_missing_ports: ERR 0081: " - "Missing port LID:0x%X Num:0x%X.\n", + "Missing port LID:0x%X Num:0x%X\n", cl_ntoh16( p_port->rec.lid), p_port->rec.port_num); status = IB_ERROR; } @@ -2975,7 +2973,7 @@ osmtest_check_missing_paths( IN osmtest_t * const p_osmt ) */ osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_check_missing_paths: ERR 0051: " - "SA did not return path SLID 0x%X to DLID 0x%X.\n", + "SA did not return path SLID 0x%X to DLID 0x%X\n", cl_ntoh16( p_path->rec.slid ), cl_ntoh16( p_path->rec.dlid ) ); status = IB_ERROR; @@ -3008,7 +3006,7 @@ osmtest_path_rec_kay_is_valid( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_path_rec_kay_is_valid: ERR 008: " - "SLID and DLID must be specified for defined paths.\n" ); + "SLID and DLID must be specified for defined paths\n" ); return ( FALSE ); } @@ -3030,7 +3028,7 @@ osmtest_validate_path_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_path_data: " - "Checking path SLID 0x%X to DLID 0x%X.\n", + "Checking path SLID 0x%X to DLID 0x%X\n", cl_ntoh16( p_rec->slid ), cl_ntoh16( p_rec->dlid ) ); } @@ -3041,7 +3039,7 @@ osmtest_validate_path_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_path_data: ERR 0056: " - "Already received path SLID 0x%X to DLID 0x%X.\n", + "Already received path SLID 0x%X to DLID 0x%X\n", cl_ntoh16( p_rec->slid ), cl_ntoh16( p_rec->dlid ) ); status = IB_ERROR; goto Exit; @@ -3059,9 +3057,9 @@ osmtest_validate_path_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_path_data: ERR 009: " - "DGID mismatch on path SLID 0x%X to DLID 0x%X.\n" - "\t\t\t\tExpected 0x%016" PRIx64 " 0x%016" PRIx64 ",\n" - "\t\t\t\tReceived 0x%016" PRIx64 " 0x%016" PRIx64 ".\n", + "DGID mismatch on path SLID 0x%X to DLID 0x%X\n" + "\t\t\t\tExpected 0x%016" PRIx64 " 0x%016" PRIx64 "\n" + "\t\t\t\tReceived 0x%016" PRIx64 " 0x%016" PRIx64 "\n", cl_ntoh16( p_path->rec.slid ), cl_ntoh16( p_path->rec.dlid ), cl_ntoh64( p_path->rec.dgid.unicast.prefix ), @@ -3082,7 +3080,7 @@ osmtest_validate_path_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_path_data: ERR 0057: " - "SGID mismatch on path SLID 0x%X to DLID 0x%X.\n" + "SGID mismatch on path SLID 0x%X to DLID 0x%X\n" "\t\t\t\tExpected 0x%016" PRIx64 " 0x%016" PRIx64 ",\n" "\t\t\t\tReceived 0x%016" PRIx64 " 0x%016" PRIx64 ".\n", cl_ntoh16( p_path->rec.slid ), @@ -3103,8 +3101,8 @@ osmtest_validate_path_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_path_data: ERR 0012: " - "PKEY mismatch on path SLID 0x%X to DLID 0x%X.\n" - "\t\t\t\tExpected 0x%X, received 0x%X.\n", + "PKEY mismatch on path SLID 0x%X to DLID 0x%X\n" + "\t\t\t\tExpected 0x%X, received 0x%X\n", cl_ntoh16( p_path->rec.slid ), cl_ntoh16( p_path->rec.dlid ), cl_ntoh64( p_path->rec.pkey ), cl_ntoh64( p_rec->pkey ) ); @@ -3132,7 +3130,7 @@ osmtest_validate_node_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_node_data: " - "Checking node 0x%016" PRIx64 ", LID 0x%X.\n", + "Checking node 0x%016" PRIx64 ", LID 0x%X\n", cl_ntoh64( p_rec->node_info.node_guid ), cl_ntoh16( p_rec->lid ) ); } @@ -3144,7 +3142,7 @@ osmtest_validate_node_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_node_data: ERR 0013: " - "Already received node 0x%016" PRIx64 ".\n", + "Already received node 0x%016" PRIx64 "\n", cl_ntoh64( p_node->rec.node_info.node_guid ) ); status = IB_ERROR; goto Exit; @@ -3160,8 +3158,8 @@ osmtest_validate_node_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_node_data: ERR 0014: " - "Field mismatch node 0x%016" PRIx64 ", LID 0x%X.\n" - "\t\t\t\tExpected LID 0x%X, received 0x%X.\n", + "Field mismatch node 0x%016" PRIx64 ", LID 0x%X\n" + "\t\t\t\tExpected LID 0x%X, received 0x%X\n", cl_ntoh64( p_rec->node_info.node_guid ), cl_ntoh16( p_rec->lid ), p_node->rec.lid, p_rec->lid ); status = IB_ERROR; @@ -3175,8 +3173,8 @@ osmtest_validate_node_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_node_data: ERR 0015: " - "Field mismatch node 0x%016" PRIx64 ", LID 0x%X.\n" - "\t\t\t\tExpected base_version 0x%X, received 0x%X.\n", + "Field mismatch node 0x%016" PRIx64 ", LID 0x%X\n" + "\t\t\t\tExpected base_version 0x%X, received 0x%X\n", cl_ntoh64( p_rec->node_info.node_guid ), cl_ntoh16( p_rec->lid ), p_node->rec.node_info.base_version, @@ -3192,8 +3190,8 @@ osmtest_validate_node_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_node_data: ERR 0016: " - "Field mismatch node 0x%016" PRIx64 ", LID 0x%X.\n" - "\t\t\t\tExpected class_version 0x%X, received 0x%X.\n", + "Field mismatch node 0x%016" PRIx64 ", LID 0x%X\n" + "\t\t\t\tExpected class_version 0x%X, received 0x%X\n", cl_ntoh64( p_rec->node_info.node_guid ), cl_ntoh16( p_rec->lid ), p_node->rec.node_info.class_version, @@ -3208,8 +3206,8 @@ osmtest_validate_node_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_node_data: ERR 0017: " - "Field mismatch node 0x%016" PRIx64 ", LID 0x%X.\n" - "\t\t\t\tExpected node_type 0x%X, received 0x%X.\n", + "Field mismatch node 0x%016" PRIx64 ", LID 0x%X\n" + "\t\t\t\tExpected node_type 0x%X, received 0x%X\n", cl_ntoh64( p_rec->node_info.node_guid ), cl_ntoh16( p_rec->lid ), p_node->rec.node_info.node_type, @@ -3224,9 +3222,9 @@ osmtest_validate_node_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_node_data: ERR 0018: " - "Field mismatch node 0x%016" PRIx64 ", LID 0x%X.\n" + "Field mismatch node 0x%016" PRIx64 ", LID 0x%X\n" "\t\t\t\tExpected sys_guid 0x%016" PRIx64 - ", received 0x%016" PRIx64 ".\n", + ", received 0x%016" PRIx64 "\n", cl_ntoh64( p_rec->node_info.node_guid ), cl_ntoh16( p_rec->lid ), cl_ntoh64( p_node->rec.node_info.sys_guid ), @@ -3241,9 +3239,9 @@ osmtest_validate_node_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_node_data: ERR 0019: " - "Field mismatch node 0x%016" PRIx64 ", LID 0x%X.\n" + "Field mismatch node 0x%016" PRIx64 ", LID 0x%X\n" "\t\t\t\tExpected node_guid 0x%016" PRIx64 - ", received 0x%016" PRIx64 ".\n", + ", received 0x%016" PRIx64 "\n", cl_ntoh64( p_rec->node_info.node_guid ), cl_ntoh16( p_rec->lid ), cl_ntoh64( p_node->rec.node_info.node_guid ), @@ -3258,9 +3256,9 @@ osmtest_validate_node_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_node_data: ERR 0031: " - "Field mismatch node 0x%016" PRIx64 ", LID 0x%X.\n" + "Field mismatch node 0x%016" PRIx64 ", LID 0x%X\n" "\t\t\t\tExpected port_guid 0x%016" PRIx64 - ", received 0x%016" PRIx64 ".\n", + ", received 0x%016" PRIx64 "\n", cl_ntoh64( p_rec->node_info.node_guid ), cl_ntoh16( p_rec->lid ), cl_ntoh64( p_node->rec.node_info.port_guid ), @@ -3276,9 +3274,9 @@ osmtest_validate_node_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_node_data: ERR 0032: " - "Field mismatch node 0x%016" PRIx64 ", LID 0x%X.\n" + "Field mismatch node 0x%016" PRIx64 ", LID 0x%X\n" "\t\t\t\tExpected partition_cap 0x%X" - ", received 0x%X.\n", + ", received 0x%X\n", cl_ntoh64( p_rec->node_info.node_guid ), cl_ntoh16( p_rec->lid ), cl_ntoh16( p_node->rec.node_info.partition_cap ), @@ -3293,9 +3291,9 @@ osmtest_validate_node_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_node_data: ERR 0033: " - "Field mismatch node 0x%016" PRIx64 ", LID 0x%X.\n" + "Field mismatch node 0x%016" PRIx64 ", LID 0x%X\n" "\t\t\t\tExpected device_id 0x%X" - ", received 0x%X.\n", + ", received 0x%X\n", cl_ntoh64( p_rec->node_info.node_guid ), cl_ntoh16( p_rec->lid ), cl_ntoh16( p_node->rec.node_info.device_id ), @@ -3310,9 +3308,9 @@ osmtest_validate_node_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_node_data: ERR 0034: " - "Field mismatch node 0x%016" PRIx64 ", LID 0x%X.\n" + "Field mismatch node 0x%016" PRIx64 ", LID 0x%X\n" "\t\t\t\tExpected revision 0x%X" - ", received 0x%X.\n", + ", received 0x%X\n", cl_ntoh64( p_rec->node_info.node_guid ), cl_ntoh16( p_rec->lid ), cl_ntoh32( p_node->rec.node_info.revision ), @@ -3347,7 +3345,7 @@ osmtest_validate_node_rec( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_node_rec: ERR 0035: " - "Unexpected node 0x%016" PRIx64 ", LID 0x%X.\n", + "Unexpected node 0x%016" PRIx64 ", LID 0x%X\n", cl_ntoh64( p_rec->node_info.node_guid ), cl_ntoh16( p_rec->lid ) ); status = IB_ERROR; @@ -3376,7 +3374,7 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: " - "Checking port LID 0x%X, Num 0x%X.\n", + "Checking port LID 0x%X, Num 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num); } @@ -3387,7 +3385,7 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0036: " - "Already received port LID 0x%X, Num 0x%X.\n", + "Already received port LID 0x%X, Num 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num); status = IB_ERROR; goto Exit; @@ -3403,8 +3401,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0037: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected LID 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected LID 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.lid, p_rec->lid ); status = IB_ERROR; @@ -3416,8 +3414,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0038: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected port_num 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected port_num 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_num, p_rec->port_num ); status = IB_ERROR; @@ -3429,8 +3427,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0039: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected m_key 0x%016" PRIx64 ", received 0x%016" PRIx64 ".\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected m_key 0x%016" PRIx64 ", received 0x%016" PRIx64 "\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.m_key, p_rec->port_info.m_key ); status = IB_ERROR; @@ -3442,8 +3440,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0040: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected subnet_prefix 0x%016" PRIx64 ", received 0x%016" PRIx64 ".\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected subnet_prefix 0x%016" PRIx64 ", received 0x%016" PRIx64 "\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.subnet_prefix, p_rec->port_info.subnet_prefix ); status = IB_ERROR; @@ -3455,8 +3453,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0041: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected base_lid 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected base_lid 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.base_lid, p_rec->port_info.base_lid ); status = IB_ERROR; @@ -3468,8 +3466,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0042: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected master_sm_base_lid 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected master_sm_base_lid 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.master_sm_base_lid, p_rec->port_info.master_sm_base_lid ); status = IB_ERROR; @@ -3481,8 +3479,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0043: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected capability_mask 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected capability_mask 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.capability_mask, p_rec->port_info.capability_mask ); status = IB_ERROR; @@ -3494,8 +3492,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0044: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected diag_code 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected diag_code 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.diag_code, p_rec->port_info.diag_code ); status = IB_ERROR; @@ -3507,8 +3505,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0045: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected m_key_lease_period 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected m_key_lease_period 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.m_key_lease_period, p_rec->port_info.m_key_lease_period ); status = IB_ERROR; @@ -3520,8 +3518,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0046: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected local_port_num 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected local_port_num 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.local_port_num, p_rec->port_info.local_port_num ); status = IB_ERROR; @@ -3533,8 +3531,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0047: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected link_width_enabled 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected link_width_enabled 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.link_width_enabled, p_rec->port_info.link_width_enabled ); status = IB_ERROR; @@ -3546,8 +3544,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0048: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected link_width_supported 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected link_width_supported 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.link_width_supported, p_rec->port_info.link_width_supported ); status = IB_ERROR; @@ -3559,8 +3557,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0049: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected link_width_active 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected link_width_active 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.link_width_active, p_rec->port_info.link_width_active ); status = IB_ERROR; @@ -3572,8 +3570,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0054: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected link_speed 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected link_speed 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.link_speed, p_rec->port_info.link_speed ); status = IB_ERROR; @@ -3585,8 +3583,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0055: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected state_info1 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected state_info1 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.state_info1, p_rec->port_info.state_info1 ); status = IB_ERROR; @@ -3598,8 +3596,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0058: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected state_info2 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected state_info2 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.state_info2, p_rec->port_info.state_info2 ); status = IB_ERROR; @@ -3611,8 +3609,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0059: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected mkey_lmc 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected mkey_lmc 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.mkey_lmc, p_rec->port_info.mkey_lmc ); status = IB_ERROR; @@ -3624,8 +3622,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0060: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected link_speed 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected link_speed 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.link_speed, p_rec->port_info.link_speed ); status = IB_ERROR; @@ -3637,8 +3635,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0061: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected mtu_smsl 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected mtu_smsl 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.mtu_smsl, p_rec->port_info.mtu_smsl ); status = IB_ERROR; @@ -3650,8 +3648,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0062: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected vl_cap 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected vl_cap 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.vl_cap, p_rec->port_info.vl_cap ); status = IB_ERROR; @@ -3663,8 +3661,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0082: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected vl_high_limit 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected vl_high_limit 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.vl_high_limit, p_rec->port_info.vl_high_limit ); status = IB_ERROR; @@ -3676,8 +3674,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0083: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected vl_arb_high_cap 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected vl_arb_high_cap 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.vl_arb_high_cap, p_rec->port_info.vl_arb_high_cap ); status = IB_ERROR; @@ -3689,8 +3687,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0084: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected vl_arb_low_cap 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected vl_arb_low_cap 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.vl_arb_low_cap, p_rec->port_info.vl_arb_low_cap ); status = IB_ERROR; @@ -3702,8 +3700,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0085: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected mtu_cap 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected mtu_cap 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.mtu_cap, p_rec->port_info.mtu_cap ); status = IB_ERROR; @@ -3716,8 +3714,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0129: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected vl_stall_life 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected vl_stall_life 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.vl_stall_life, p_rec->port_info.vl_stall_life ); status = IB_ERROR; @@ -3730,8 +3728,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0086: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected vl_enforce 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected vl_enforce 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.vl_enforce, p_rec->port_info.vl_enforce ); status = IB_ERROR; @@ -3743,8 +3741,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0087: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected m_key_violations 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected m_key_violations 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.m_key_violations, p_rec->port_info.m_key_violations ); status = IB_ERROR; @@ -3756,8 +3754,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0088: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected p_key_violations 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected p_key_violations 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.p_key_violations, p_rec->port_info.p_key_violations ); status = IB_ERROR; @@ -3769,8 +3767,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0089: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected q_key_violations 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected q_key_violations 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.q_key_violations, p_rec->port_info.q_key_violations ); status = IB_ERROR; @@ -3782,8 +3780,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0090: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected guid_cap 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected guid_cap 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.guid_cap, p_rec->port_info.guid_cap ); status = IB_ERROR; @@ -3795,8 +3793,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0091: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected subnet_timeout 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected subnet_timeout 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, ib_port_info_get_timeout(&p_port->rec.port_info), ib_port_info_get_timeout(&p_rec->port_info) ); @@ -3809,8 +3807,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0092: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected resp_time_value 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected resp_time_value 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.resp_time_value, p_rec->port_info.resp_time_value ); status = IB_ERROR; @@ -3822,8 +3820,8 @@ osmtest_validate_port_data( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_data: ERR 0093: " - "Field mismatch port LID 0x%X Num:0x%X.\n" - "\t\t\t\tExpected error_threshold 0x%X, received 0x%X.\n", + "Field mismatch port LID 0x%X Num:0x%X\n" + "\t\t\t\tExpected error_threshold 0x%X, received 0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num, p_port->rec.port_info.error_threshold, p_rec->port_info.error_threshold ); status = IB_ERROR; @@ -3857,7 +3855,7 @@ osmtest_validate_port_rec( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_port_rec: ERR 0094: " - "Unexpected port LID 0x%X, Num:0x%X.\n", + "Unexpected port LID 0x%X, Num:0x%X\n", cl_ntoh16( p_rec->lid ), p_rec->port_num ); status = IB_ERROR; goto Exit; @@ -3892,7 +3890,7 @@ osmtest_validate_path_rec( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_path_rec: ERR 0095: " - "Unexpected path SLID 0x%X to DLID 0x%X.\n", + "Unexpected path SLID 0x%X to DLID 0x%X\n", cl_ntoh16( p_rec->slid ), cl_ntoh16( p_rec->dlid ) ); status = IB_ERROR; goto Exit; @@ -3942,7 +3940,7 @@ osmtest_validate_all_node_recs( IN osmtest_t * const p_osmt ) { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_validate_all_node_recs: " - "Received %u records.\n", num_recs ); + "Received %u records\n", num_recs ); } /* @@ -4027,7 +4025,7 @@ osmtest_validate_all_path_recs( IN osmtest_t * const p_osmt ) { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_validate_all_path_recs: " - "Received %u records.\n", num_recs ); + "Received %u records\n", num_recs ); } /* @@ -4107,7 +4105,7 @@ osmtest_validate_single_path_rec_lid_pair( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_single_path_rec_lid_pair: ERR 00103: " - "Too many records. Expected 1, received %u.\n", num_recs ); + "Too many records. Expected 1, received %u\n", num_recs ); status = IB_ERROR; } @@ -4161,7 +4159,7 @@ osmtest_validate_single_node_rec_lid( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_validate_single_node_rec_lid: " - "Getting NodeRecord for node with LID 0x%X.\n", + "Getting NodeRecord for node with LID 0x%X\n", cl_ntoh16( lid ) ); } @@ -4203,13 +4201,13 @@ osmtest_validate_single_node_rec_lid( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_single_node_rec_lid: ERR 00106: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); if( status == IB_REMOTE_ERROR ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_single_node_rec_lid: " - "Remote error = %s.\n", + "Remote error = %s\n", ib_get_mad_status_str( osm_madw_get_mad_ptr ( context.result. p_result_madw ) ) ); @@ -4274,7 +4272,7 @@ osmtest_validate_single_port_rec_lid( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_single_port_rec_lid: ERR 00108: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); goto Exit; } @@ -4327,7 +4325,7 @@ osmtest_validate_single_path_rec_guid_pair( IN osmtest_t * const p_osmt, osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_single_path_rec_guid_pair: " "\n\t\t\t\tChecking src 0x%016" PRIx64 - " to dest 0x%016" PRIx64 ".\n", + " to dest 0x%016" PRIx64 "\n", cl_ntoh64( p_pair->src_guid ), cl_ntoh64( p_pair->dest_guid ) ); } @@ -4359,13 +4357,13 @@ osmtest_validate_single_path_rec_guid_pair( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_single_path_rec_guid_pair: ERR 00111: " - "ib_query failed (%s).\n", ib_get_err_str( status ) ); + "ib_query failed (%s)\n", ib_get_err_str( status ) ); if( status == IB_REMOTE_ERROR ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_single_path_rec_guid_pair: " - "Remote error = %s.\n", + "Remote error = %s\n", ib_get_mad_status_str( osm_madw_get_mad_ptr ( context.result. p_result_madw ) ) ); @@ -4389,9 +4387,9 @@ osmtest_validate_single_path_rec_guid_pair( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_single_path_rec_guid_pair: ERR 00112: " - "Destination GUID mismatch.\n" + "Destination GUID mismatch\n" "\t\t\t\texpected 0x%016" PRIx64 - ", received 0x%016" PRIx64 ".\n", + ", received 0x%016" PRIx64 "\n", cl_ntoh64( p_pair->dest_guid ), cl_ntoh64( p_rec->dgid.unicast.interface_id ) ); } @@ -4400,7 +4398,7 @@ osmtest_validate_single_path_rec_guid_pair( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_validate_single_path_rec_guid_pair: ERR 00113: " - "Source GUID mismatch.\n" + "Source GUID mismatch\n" "\t\t\t\texpected 0x%016" PRIx64 ", received 0x%016" PRIx64 ".\n", cl_ntoh64( p_pair->src_guid ), @@ -4454,7 +4452,7 @@ osmtest_validate_single_path_recs( IN osmtest_t * const p_osmt ) { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_validate_single_path_recs: " - "Validating individual path record queries.\n" ); + "Validating individual path record queries\n" ); } p_path_tbl = &p_osmt->exp_subn.path_tbl; @@ -4479,7 +4477,7 @@ osmtest_validate_single_path_recs( IN osmtest_t * const p_osmt ) { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_validate_single_path_recs: " - "Total of %u path records validated using LID based query.\n", cnt ); + "Total of %u path records validated using LID based query\n", cnt ); } status = osmtest_check_missing_paths( p_osmt ); @@ -4517,7 +4515,7 @@ osmtest_validate_single_path_recs( IN osmtest_t * const p_osmt ) { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_validate_single_path_recs: " - "Total of %u path records validated using GUID based query.\n", cnt ); + "Total of %u path records validated using GUID based query\n", cnt ); } status = osmtest_check_missing_paths( p_osmt ); @@ -4555,7 +4553,7 @@ osmtest_validate_single_node_recs( IN osmtest_t * const p_osmt ) { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_validate_single_node_recs: " - "Validating individual node record queries.\n" ); + "Validating individual node record queries\n" ); } /* @@ -4576,7 +4574,7 @@ osmtest_validate_single_node_recs( IN osmtest_t * const p_osmt ) { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_validate_single_node_recs: " - "Total of %u node records validated.\n", cnt ); + "Total of %u node records validated\n", cnt ); } status = osmtest_check_missing_nodes( p_osmt ); @@ -4614,7 +4612,7 @@ osmtest_validate_single_port_recs( IN osmtest_t * const p_osmt ) { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_validate_single_port_recs: " - "Validating individual port record queries.\n" ); + "Validating individual port record queries\n" ); } /* @@ -4633,7 +4631,7 @@ osmtest_validate_single_port_recs( IN osmtest_t * const p_osmt ) { osm_log( &p_osmt->log, OSM_LOG_VERBOSE, "osmtest_validate_single_port_recs: " - "Total of %u port records validated.\n", cnt ); + "Total of %u port records validated\n", cnt ); } status = osmtest_check_missing_ports( p_osmt ); @@ -4782,7 +4780,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, */ osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_parse_node: ERR 00119: " - "Unexpected end of file.\n" ); + "Unexpected end of file\n" ); status = IB_ERROR; goto Exit; } @@ -4801,7 +4799,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_parse_node: ERR 00120: " - "Ignoring line %u with unknown token: %s.\n", + "Ignoring line %u with unknown token: %s\n", *p_line_num, &line[offset] ); continue; } @@ -4810,7 +4808,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_node: " - "Found '%s' (line %u).\n", p_tok->str, *p_line_num ); + "Found '%s' (line %u)\n", p_tok->str, *p_line_num ); } str_skip_token( line, &offset ); @@ -4828,7 +4826,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_node: " - "lid = 0x%X.\n", cl_ntoh16( p_node->rec.lid ) ); + "lid = 0x%X\n", cl_ntoh16( p_node->rec.lid ) ); } break; @@ -4840,7 +4838,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_node: " - "base_version = 0x%X.\n", + "base_version = 0x%X\n", p_node->rec.node_info.base_version ); } break; @@ -4853,7 +4851,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_node: " - "class_version = 0x%X.\n", + "class_version = 0x%X\n", p_node->rec.node_info.class_version ); } break; @@ -4866,7 +4864,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_node: " - "node_type = 0x%X.\n", + "node_type = 0x%X\n", p_node->rec.node_info.node_type ); } break; @@ -4879,7 +4877,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_node: " - "num_ports = 0x%X.\n", + "num_ports = 0x%X\n", p_node->rec.node_info.num_ports ); } break; @@ -4892,7 +4890,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_node: " - "sys_guid = 0x%016" PRIx64 ".\n", + "sys_guid = 0x%016" PRIx64 "\n", cl_ntoh64( p_node->rec.node_info.sys_guid ) ); } break; @@ -4905,7 +4903,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_node: " - "node_guid = 0x%016" PRIx64 ".\n", + "node_guid = 0x%016" PRIx64 "\n", cl_ntoh64( p_node->rec.node_info.node_guid ) ); } break; @@ -4918,7 +4916,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_node: " - "port_guid = 0x%016" PRIx64 ".\n", + "port_guid = 0x%016" PRIx64 "\n", cl_ntoh64( p_node->rec.node_info.port_guid ) ); } break; @@ -4934,7 +4932,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_node: " - "partition_cap = 0x%X.\n", + "partition_cap = 0x%X\n", cl_ntoh16( p_node->rec.node_info.partition_cap ) ); } break; @@ -4949,7 +4947,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_node: " - "device_id = 0x%X.\n", + "device_id = 0x%X\n", cl_ntoh16( p_node->rec.node_info.device_id ) ); } break; @@ -4962,7 +4960,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_node: " - "revision = 0x%X.\n", + "revision = 0x%X\n", cl_ntoh32( p_node->rec.node_info.revision ) ); } break; @@ -4976,7 +4974,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_node: " - "local_port_num = 0x%X.\n", + "local_port_num = 0x%X\n", ib_node_info_get_local_port_num( &p_node->rec. node_info ) ); } @@ -4991,7 +4989,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_node: " - "vendor_id = 0x%X.\n", + "vendor_id = 0x%X\n", cl_ntoh32( ib_node_info_get_vendor_id ( &p_node->rec.node_info ) ) ); } @@ -5004,7 +5002,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, default: osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_parse_node: ERR 00121: " - "Ignoring line %u with unknown token: %s.\n", + "Ignoring line %u with unknown token: %s\n", *p_line_num, &line[offset] ); break; @@ -5019,7 +5017,7 @@ osmtest_parse_node( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_parse_node: ERR 00122: " - "LID must be specified for defined nodes.\n" ); + "LID must be specified for defined nodes\n" ); node_delete( p_node ); goto Exit; } @@ -5072,7 +5070,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, */ osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_parse_port: ERR 00123: " - "Unexpected end of file.\n" ); + "Unexpected end of file\n" ); status = IB_ERROR; goto Exit; } @@ -5091,7 +5089,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_parse_port: ERR 00124: " - "Ignoring line %u with unknown token: %s.\n", + "Ignoring line %u with unknown token: %s\n", *p_line_num, &line[offset] ); continue; } @@ -5100,7 +5098,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "Found '%s' (line %u).\n", p_tok->str, *p_line_num ); + "Found '%s' (line %u)\n", p_tok->str, *p_line_num ); } str_skip_token( line, &offset ); @@ -5118,7 +5116,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "lid = 0x%X.\n", cl_ntoh16( p_port->rec.lid ) ); + "lid = 0x%X\n", cl_ntoh16( p_port->rec.lid ) ); } break; @@ -5130,7 +5128,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "port_num = 0x%u.\n", + "port_num = 0x%u\n", p_port->rec.port_num ); } break; @@ -5143,7 +5141,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "m_key = 0x%016" PRIx64 ".\n", + "m_key = 0x%016" PRIx64 "\n", cl_ntoh64( p_port->rec.port_info.m_key ) ); } break; @@ -5156,7 +5154,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "subnet_prefix = 0x%016" PRIx64 ".\n", + "subnet_prefix = 0x%016" PRIx64 "\n", cl_ntoh64( p_port->rec.port_info.subnet_prefix ) ); } break; @@ -5169,7 +5167,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "base_lid = 0x%X.\n", cl_ntoh16( p_port->rec.port_info.base_lid ) ); + "base_lid = 0x%X\n", cl_ntoh16( p_port->rec.port_info.base_lid ) ); } break; @@ -5181,7 +5179,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "master_sm_base_lid = 0x%X.\n", + "master_sm_base_lid = 0x%X\n", cl_ntoh16( p_port->rec.port_info.master_sm_base_lid ) ); } break; @@ -5194,7 +5192,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "capability_mask = 0x%X.\n", + "capability_mask = 0x%X\n", cl_ntoh32( p_port->rec.port_info.capability_mask ) ); } break; @@ -5207,7 +5205,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "diag_code = 0x%X.\n", + "diag_code = 0x%X\n", cl_ntoh16( p_port->rec.port_info.diag_code ) ); } break; @@ -5220,7 +5218,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "m_key_lease_period = 0x%X.\n", + "m_key_lease_period = 0x%X\n", cl_ntoh16( p_port->rec.port_info.m_key_lease_period ) ); } break; @@ -5233,7 +5231,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "local_port_num = 0x%u.\n", + "local_port_num = 0x%u\n", p_port->rec.port_info.local_port_num ); } break; @@ -5246,7 +5244,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "link_width_enabled = 0x%u.\n", + "link_width_enabled = 0x%u\n", p_port->rec.port_info.link_width_enabled ); } break; @@ -5259,7 +5257,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "link_width_supported = 0x%u.\n", + "link_width_supported = 0x%u\n", p_port->rec.port_info.link_width_supported ); } break; @@ -5272,7 +5270,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "link_width_active = 0x%u.\n", + "link_width_active = 0x%u\n", p_port->rec.port_info.link_width_active ); } break; @@ -5286,7 +5284,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "link_speed_supported = 0x%u.\n", + "link_speed_supported = 0x%u\n", ib_port_info_get_link_speed_sup(&p_port->rec.port_info)); } break; @@ -5300,7 +5298,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "port_state = 0x%u.\n", + "port_state = 0x%u\n", ib_port_info_get_port_state(&p_port->rec.port_info)); } break; @@ -5313,7 +5311,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "state_info2 = 0x%u.\n", + "state_info2 = 0x%u\n", p_port->rec.port_info.state_info2 ); } break; @@ -5327,7 +5325,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "mpb = 0x%u.\n", + "mpb = 0x%u\n", ib_port_info_get_mpb(&p_port->rec.port_info) ); } break; @@ -5342,7 +5340,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "lmc = 0x%u.\n", + "lmc = 0x%u\n", ib_port_info_get_lmc(&p_port->rec.port_info) ); } break; @@ -5355,7 +5353,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "link_speed = 0x%u.\n", + "link_speed = 0x%u\n", p_port->rec.port_info.link_speed ); } break; @@ -5368,7 +5366,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "mtu_smsl = 0x%u.\n", + "mtu_smsl = 0x%u\n", p_port->rec.port_info.mtu_smsl ); } break; @@ -5381,7 +5379,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "vl_cap = 0x%u.\n", + "vl_cap = 0x%u\n", p_port->rec.port_info.vl_cap ); } break; @@ -5394,7 +5392,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "vl_high_limit = 0x%u.\n", + "vl_high_limit = 0x%u\n", p_port->rec.port_info.vl_high_limit ); } break; @@ -5407,7 +5405,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "vl_arb_high_cap = 0x%u.\n", + "vl_arb_high_cap = 0x%u\n", p_port->rec.port_info.vl_arb_high_cap ); } break; @@ -5420,7 +5418,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "vl_arb_low_cap = 0x%u.\n", + "vl_arb_low_cap = 0x%u\n", p_port->rec.port_info.vl_arb_low_cap ); } break; @@ -5433,7 +5431,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "mtu_cap = 0x%u.\n", + "mtu_cap = 0x%u\n", p_port->rec.port_info.mtu_cap ); } break; @@ -5446,7 +5444,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "vl_stall_life = 0x%u.\n", + "vl_stall_life = 0x%u\n", p_port->rec.port_info.vl_stall_life ); } break; @@ -5459,7 +5457,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "vl_enforce = 0x%u.\n", + "vl_enforce = 0x%u\n", p_port->rec.port_info.vl_enforce ); } break; @@ -5472,7 +5470,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "m_key_violations = 0x%X.\n", + "m_key_violations = 0x%X\n", cl_ntoh16( p_port->rec.port_info.m_key_violations ) ); } break; @@ -5485,7 +5483,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "p_key_violations = 0x%X.\n", + "p_key_violations = 0x%X\n", cl_ntoh16( p_port->rec.port_info.p_key_violations ) ); } break; @@ -5498,7 +5496,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "q_key_violations = 0x%X.\n", + "q_key_violations = 0x%X\n", cl_ntoh16( p_port->rec.port_info.q_key_violations ) ); } break; @@ -5511,7 +5509,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "guid_cap = 0x%u.\n", + "guid_cap = 0x%u\n", p_port->rec.port_info.guid_cap ); } break; @@ -5524,7 +5522,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "subnet_timeout = 0x%u.\n", + "subnet_timeout = 0x%u\n", ib_port_info_get_timeout(&p_port->rec.port_info) ); } break; @@ -5537,7 +5535,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "resp_time_value = 0x%u.\n", + "resp_time_value = 0x%u\n", p_port->rec.port_info.resp_time_value ); } break; @@ -5550,7 +5548,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_port: " - "error_threshold = 0x%u.\n", + "error_threshold = 0x%u\n", p_port->rec.port_info.error_threshold ); } break; @@ -5562,7 +5560,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, default: osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_parse_port: ERR 00125: " - "Ignoring line %u with unknown token: %s.\n", + "Ignoring line %u with unknown token: %s\n", *p_line_num, &line[offset] ); break; @@ -5577,7 +5575,7 @@ osmtest_parse_port( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_parse_port: ERR 00126: " - "LID must be specified for defined ports.\n" ); + "LID must be specified for defined ports\n" ); port_delete( p_port ); goto Exit; } @@ -5623,7 +5621,7 @@ osmtest_parse_path( IN osmtest_t * const p_osmt, */ osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_parse_path: ERR 00127: " - "Unexpected end of file.\n" ); + "Unexpected end of file\n" ); status = IB_ERROR; goto Exit; } @@ -5642,7 +5640,7 @@ osmtest_parse_path( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_parse_path: ERR 00128: " - "Ignoring line %u with unknown token: %s.\n", + "Ignoring line %u with unknown token: %s\n", *p_line_num, &line[offset] ); continue; } @@ -5651,7 +5649,7 @@ osmtest_parse_path( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_path: " - "Found '%s' (line %u).\n", p_tok->str, *p_line_num ); + "Found '%s' (line %u)\n", p_tok->str, *p_line_num ); } str_skip_token( line, &offset ); @@ -5676,7 +5674,7 @@ osmtest_parse_path( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_path: " - "dgid = 0x%016" PRIx64 " 0x%016" PRIx64 ".\n", + "dgid = 0x%016" PRIx64 " 0x%016" PRIx64 "\n", cl_ntoh64( p_path->rec.dgid.unicast.prefix ), cl_ntoh64( p_path->rec.dgid.unicast.interface_id ) ); } @@ -5697,7 +5695,7 @@ osmtest_parse_path( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_path: " - "sgid = 0x%016" PRIx64 " 0x%016" PRIx64 ".\n", + "sgid = 0x%016" PRIx64 " 0x%016" PRIx64 "\n", cl_ntoh64( p_path->rec.sgid.unicast.prefix ), cl_ntoh64( p_path->rec.sgid.unicast.interface_id ) ); } @@ -5711,7 +5709,7 @@ osmtest_parse_path( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_path: " - "dlid = 0x%X.\n", cl_ntoh16( p_path->rec.dlid ) ); + "dlid = 0x%X\n", cl_ntoh16( p_path->rec.dlid ) ); } break; @@ -5723,7 +5721,7 @@ osmtest_parse_path( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_path: " - "slid = 0x%X.\n", cl_ntoh16( p_path->rec.slid ) ); + "slid = 0x%X\n", cl_ntoh16( p_path->rec.slid ) ); } break; @@ -5735,7 +5733,7 @@ osmtest_parse_path( IN osmtest_t * const p_osmt, { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_parse_path: " - "pkey = 0x%X.\n", cl_ntoh16( p_path->rec.pkey ) ); + "pkey = 0x%X\n", cl_ntoh16( p_path->rec.pkey ) ); } break; @@ -5746,7 +5744,7 @@ osmtest_parse_path( IN osmtest_t * const p_osmt, default: osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_parse_path: ERR 00129: " - "Ignoring line %u with unknown token: %s.\n", + "Ignoring line %u with unknown token: %s\n", *p_line_num, &line[offset] ); break; @@ -5792,7 +5790,7 @@ osmtest_create_db( IN osmtest_t * const p_osmt ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_create_db: ERR 00130: " - "Unable to open inventory file (%s).\n", p_osmt->opt.file_name); + "Unable to open inventory file (%s)\n", p_osmt->opt.file_name); status = IB_ERROR; goto Exit; } @@ -5816,7 +5814,7 @@ osmtest_create_db( IN osmtest_t * const p_osmt ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_create_db: ERR 00131: " - "Ignoring line %u: %s.\n", line_num, &line[offset] ); + "Ignoring line %u: %s\n", line_num, &line[offset] ); continue; } @@ -5824,7 +5822,7 @@ osmtest_create_db( IN osmtest_t * const p_osmt ) { osm_log( &p_osmt->log, OSM_LOG_DEBUG, "osmtest_create_db: " - "Found '%s' (line %u).\n", p_tok->str, line_num ); + "Found '%s' (line %u)\n", p_tok->str, line_num ); } switch ( p_tok->val ) @@ -5847,7 +5845,7 @@ osmtest_create_db( IN osmtest_t * const p_osmt ) default: osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_create_db: ERR 00132: " - "Ignoring line %u: %s.\n", line_num, &line[offset] ); + "Ignoring line %u: %s\n", line_num, &line[offset] ); break; } @@ -5855,7 +5853,7 @@ osmtest_create_db( IN osmtest_t * const p_osmt ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_create_db: ERR 00133: " - "Bad status received during parsing (%s).\n", + "Bad status received during parsing (%s)\n", ib_get_err_str( status ) ); fclose( fh ); goto Exit; @@ -5959,7 +5957,7 @@ osmtest_bind( IN osmtest_t * p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_bind: ERR 00135: " - "No local ports. Unable to proceed.\n", + "No local ports. Unable to proceed\n", ib_get_err_str( status ) ); goto Exit; } @@ -5977,7 +5975,7 @@ osmtest_bind( IN osmtest_t * p_osmt, { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_bind: ERR 00136: " - "No local port with guid 0x%016" PRIx64 ".\n", + "No local port with guid 0x%016" PRIx64 "\n", cl_ntoh64( guid ) ); status = IB_NOT_FOUND; goto Exit; @@ -6003,7 +6001,8 @@ osmtest_bind( IN osmtest_t * p_osmt, if( p_osmt->h_bind == OSM_BIND_INVALID_HANDLE ) { osm_log( &p_osmt->log, OSM_LOG_ERROR, - "osmtest_bind: ERR 00137: " "Unable to bind to SA\n" ); + "osmtest_bind: ERR 00137: " + "Unable to bind to SA\n" ); status = IB_ERROR; goto Exit; } @@ -6097,7 +6096,7 @@ osmtest_run( IN osmtest_t * const p_osmt ) default: osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmtest_run: ERR 00144: " - "Unknown stress test value %u.\n", + "Unknown stress test value %u\n", p_osmt->opt.stress ); break; } -- 2.41.0