Skip to content

Commit 8716dc2

Browse files
committed
xml/import: disable the currently unused importing of future types
Was useful when we knew MemCache was coming but couldn't replace it with groups etc. Nothing like this right now. Signed-off-by: Brice Goglin <[email protected]>
1 parent 3072d16 commit 8716dc2

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

hwloc/topology-xml.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -698,14 +698,19 @@ hwloc__xml_import_object(hwloc_topology_t topology,
698698
/* deal with possible future type */
699699
obj->type = HWLOC_OBJ_GROUP;
700700
obj->attr->group.kind = HWLOC_GROUP_KIND_LINUX_CLUSTER;
701-
} else if (!strcasecmp(attrvalue, "MemCache")) {
701+
}
702+
#if 0
703+
/* reenable if there's ever a future type that should be ignored without being an error */
704+
else if (!strcasecmp(attrvalue, "MemCache")) {
702705
/* ignore possible future type */
703706
obj->type = _HWLOC_OBJ_FUTURE;
704707
ignored = 1;
705708
if (hwloc__xml_verbose())
706709
fprintf(stderr, "%s: %s object not-supported, will be ignored\n",
707710
state->global->msgprefix, attrvalue);
708-
} else {
711+
}
712+
#endif
713+
else {
709714
if (hwloc__xml_verbose())
710715
fprintf(stderr, "%s: unrecognized object type string %s\n",
711716
state->global->msgprefix, attrvalue);

0 commit comments

Comments
 (0)