Fixing the error flow when somebody tries to use XRC without XOOB.

This commit was SVN r18527.

ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c

@@ -587,7 +587,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl,
     /* IBCM is not supported if we have any XRC QPs */
     if (mca_btl_openib_component.num_xrc_qps > 0) {
         OPAL_OUTPUT_VERBOSE((5, mca_btl_base_output,
-                             "openib BTL: ibcm CPC not supported with XRC receive queues"));
+                             "openib BTL: ibcm CPC not supported with XRC receive queues, please try xoob CPC; skipped"));
         rc = OMPI_ERR_NOT_SUPPORTED;
         goto error;
     }

ompi/mca/btl/openib/connect/btl_openib_connect_oob.c

@@ -124,6 +124,11 @@ static int oob_component_query(mca_btl_openib_module_t *btl,
     }
 #endif
 
+    if (mca_btl_openib_component.num_xrc_qps > 0) {
+        orte_output_verbose(5, mca_btl_base_output,
+                            "openib BTL: oob CPC not supported with XRC receive queues, please try xoob CPC; skipped");
+        return OMPI_ERR_NOT_SUPPORTED;
+    }
     /* If this btl supports OOB, then post the RML message.  But
        ensure to only post it *once*, because another btl may have
        come in before this and already posted it. */

ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c

@@ -1023,7 +1023,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_
     /* RDMACM is not supported if we have any XRC QPs */
     if (mca_btl_openib_component.num_xrc_qps > 0) {
         orte_output_verbose(5, mca_btl_base_output,
-                            "openib BTL: rdmacm CPC not supported with XRC receive queues; skipped");
+                            "openib BTL: rdmacm CPC not supported with XRC receive queues, please try xoob CPC; skipped");
         rc = OMPI_ERR_NOT_SUPPORTED;
         goto out;
     }