Some minor changes to support vm's

This commit was SVN r22975.

orte/mca/ess/cm/ess_cm_component.c

@@ -70,9 +70,9 @@ orte_ess_cm_component_open(void)
 
 int orte_ess_cm_component_query(mca_base_module_t **module, int *priority)
 {
-    /* if we are a CM program, then select us */
+    /* if we are a CM program, then we are available */
-    if (ORTE_PROC_IS_CM && !ORTE_PROC_IS_HNP) {
+    if (ORTE_PROC_IS_CM) {
-        *priority = 1000;
+        *priority = 50;
         *module = (mca_base_module_t *)&orte_ess_cm_module;
         return ORTE_SUCCESS;
     }

orte/mca/iof/base/iof_base_select.c

@@ -22,6 +22,7 @@
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 
+#include "orte/util/proc_info.h"
 
 #include "orte/mca/iof/iof.h"
 #include "orte/mca/iof/base/base.h"
@@ -33,7 +34,6 @@
  */
 int orte_iof_base_select(void)
 {
-    int exit_status = ORTE_SUCCESS;
     orte_iof_base_component_t *best_component = NULL;
     orte_iof_base_module_t *best_module = NULL;
     
@@ -44,21 +44,17 @@ int orte_iof_base_select(void)
                                         &orte_iof_base.iof_components_opened,
                                         (mca_base_module_t **) &best_module,
                                         (mca_base_component_t **) &best_component) ) {
-        /* This will only happen if no component was selected, which
+        /* it is okay to not find a module if we are a CM process */
-         * is an error.
+        if (ORTE_PROC_IS_CM) {
-         *
+            return ORTE_SUCCESS;
-         * NOTE: processes do not open/select the IOF - only daemons,
+        }
-         * the HNP, and tools do. 
+        /* otherwise, this is a problem */
-         */
+        return ORTE_ERR_NOT_FOUND;
-        exit_status = ORTE_ERR_NOT_FOUND;
-        goto cleanup;
     }
     
     /* Save the winner */
     orte_iof = *best_module;
 
-cleanup:
+    return ORTE_SUCCESS;
-    return exit_status;
-    
 }