Fixes per review by jsquyres. Piggy back on btl_base_verbose rather than using my own special MCA var.

This commit was SVN r31427.

ompi/mca/btl/openib/btl_openib.h

@@ -304,7 +304,6 @@ struct mca_btl_openib_component_t {
     bool enable_srq_resize;
     int memory_registration_verbose_level;
     int memory_registration_verbose;
-    int device_selection_verbose;
     int ignore_locality;
 #if BTL_OPENIB_FAILOVER_ENABLED
     int verbose_failover;

ompi/mca/btl/openib/btl_openib_component.c

@@ -2556,11 +2556,10 @@ btl_openib_component_init(int *num_btl_modules,
                 mca_btl_openib_component.ib_max_btls); i++) {
         if (0 != mca_btl_openib_component.ib_num_btls &&
             distance != dev_sorted[i].distance) {
-            if (mca_btl_openib_component.device_selection_verbose) {
-                opal_output(0, "[rank=%d] openib: skipping device %s; it is too far away", 
-                            ORTE_PROC_MY_NAME->vpid,
-                            ibv_get_device_name(dev_sorted[i].ib_dev));
-            }
+            opal_output_verbose(1, ompi_btl_base_framework.framework_output, 
+                                "[rank=%d] openib: skipping device %s; it is too far away", 
+                                ORTE_PROC_MY_NAME->vpid,
+                                ibv_get_device_name(dev_sorted[i].ib_dev));
             break;
         }
 
@@ -2600,11 +2599,10 @@ btl_openib_component_init(int *num_btl_modules,
             free(dev_sorted);
             goto no_btls;
         } else {
-            if (mca_btl_openib_component.device_selection_verbose) {
-                opal_output(0, "[rank=%d] openib: using device %s", 
-                            ORTE_PROC_MY_NAME->vpid,
-                            ibv_get_device_name(dev_sorted[i].ib_dev));
-            }
+            opal_output_verbose(1, ompi_btl_base_framework.framework_output, 
+                                "[rank=%d] openib: using device %s", 
+                                ORTE_PROC_MY_NAME->vpid,
+                                ibv_get_device_name(dev_sorted[i].ib_dev));
         }
     }
     free(dev_sorted);

ompi/mca/btl/openib/btl_openib_mca.c

@@ -537,12 +537,6 @@ int btl_openib_register_mca_params(void)
                   "(0 = no output, nonzero = output)", 0,
 		  &mca_btl_openib_component.memory_registration_verbose_level, 0));
 
-    /* Help see which devices are being used */
-    CHECK(reg_int("device_selection_verbose", NULL,
-                  "Output some verbose device selection information "
-                  "(0 = no output, nonzero = output)", 0,
-                  &mca_btl_openib_component.device_selection_verbose, REGINT_GE_ZERO));
-
     CHECK(reg_int("ignore_locality", NULL,
                   "Ignore any locality information and use all devices "
                   "(0 = use locality informaiton and use only close devices, nonzero = ignore locality information)", 0,