core: Don't propagate nodesets into Misc object...

core: Don't propagate nodesets into Misc objects added by parent

Those have no cpusets, we don't want nodesets either.

This commit completes r5710:
  core: fix support for Misc objects added by parent

This commit was SVN r5725.

The following SVN revision numbers were found above:
  r5710 --> 6af99e820bd7c0f266ffd782185c9f099ceb08dc

diff --git a/src/topology.c b/src/topology.c
index 3a083c084413f923c0b663e66af41d805fcbe397..f757d906ef2512eae2b6f03f882312162fd7104d 100644 (file)
--- a/src/topology.c
+++ b/src/topology.c
@@ -1314,6 +1314,9 @@ propagate_nodeset(hwloc_obj_t obj, hwloc_obj_t sys)
     /* don't propagate nodesets in I/O objects, keep them NULL */
     if (hwloc_obj_type_is_io(child->type))
       return;
+    /* don't propagate nodesets in Misc inserted by parent (no nodeset if no cpuset) */
+    if (child->type == HWLOC_OBJ_MISC && !child->cpuset)
+      return;
 
     /* Propagate singleton nodesets down */
     if (parent_weight == 1) {