xml/export/v2: export topo info attrs as root info in v2

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

hwloc/topology-xml.c

@@ -2222,6 +2222,9 @@ hwloc__xml_export_object_contents (hwloc__xml_export_state_t state, hwloc_topolo
 
   for(i=0; i<obj->infos.count; i++)
     hwloc__xml_export_info_attr(state, obj->infos.array[i].name, obj->infos.array[i].value);
+  if (v2export && !obj->parent)
+    for(i=0; i<topology->infos.count; i++)
+      hwloc__xml_export_info_attr(state, topology->infos.array[i].name, topology->infos.array[i].value);
 
   if (v2export && obj->type == HWLOC_OBJ_OS_DEVICE && obj->subtype && !hwloc_obj_get_info_by_name(obj, "Backend")) {
     /* v2 gpus had Backend inside the object itself */
@@ -2559,7 +2562,8 @@ hwloc__xml_export_topology(hwloc__xml_export_state_t state, hwloc_topology_t top
       hwloc__xml_v2export_support(state, topology);
     hwloc__xml_export_memattrs(state, topology);
     hwloc__xml_export_cpukinds(state, topology);
-    hwloc__xml_export_infos(state, topology);
+    if (!(flags & HWLOC_TOPOLOGY_EXPORT_XML_FLAG_V2))
+      hwloc__xml_export_infos(state, topology);
 }
 
 void

tests/hwloc/xml/cxlmem+dax.v2.xml

@@ -14,6 +14,13 @@
     <info name="DMIBIOSVersion" value="0.0.0"/>
     <info name="DMIBIOSDate" value="02/06/2015"/>
     <info name="DMISysVendor" value="QEMU"/>
+    <info name="Backend" value="Linux"/>
+    <info name="LinuxCgroup" value="/"/>
+    <info name="OSName" value="Linux"/>
+    <info name="OSRelease" value="6.1.0-rc4+"/>
+    <info name="OSVersion" value="#1 SMP PREEMPT_DYNAMIC Thu Dec  1 15:21:30 CET 2022"/>
+    <info name="HostName" value="efi"/>
+    <info name="Architecture" value="x86_64"/>
     <object type="Package" os_index="0" cpuset="0x0000000f" complete_cpuset="0x0000000f" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="3">
       <info name="CPUVendor" value="GenuineIntel"/>
       <info name="CPUFamilyNumber" value="15"/>
@@ -170,11 +177,4 @@
   <support name="discovery.disallowed_pu"/>
   <support name="discovery.disallowed_numa"/>
   <support name="custom.exported_support"/>
-  <info name="Backend" value="Linux"/>
-  <info name="LinuxCgroup" value="/"/>
-  <info name="OSName" value="Linux"/>
-  <info name="OSRelease" value="6.1.0-rc4+"/>
-  <info name="OSVersion" value="#1 SMP PREEMPT_DYNAMIC Thu Dec  1 15:21:30 CET 2022"/>
-  <info name="HostName" value="efi"/>
-  <info name="Architecture" value="x86_64"/>
 </topology>

utils/lstopo/test-lstopo.output

@@ -157,6 +157,8 @@ Group:4 NUMANode:1 PU:4
 <!DOCTYPE topology SYSTEM "hwloc2.dtd">
 <topology version="2.0">
   <object type="Machine" os_index="0" cpuset="0x0000ffff" complete_cpuset="0x0000ffff" allowed_cpuset="0x0000ffff" nodeset="0x0000000f" complete_nodeset="0x0000000f" allowed_nodeset="0x0000000f" gp_index="1">
+    <info name="Backend" value="Synthetic"/>
+    <info name="SyntheticDescription" value="node:4 pu:4"/>
     <object type="Group" cpuset="0x0000000f" complete_cpuset="0x0000000f" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="7" kind="1001" subkind="0">
       <object type="NUMANode" os_index="0" cpuset="0x0000000f" complete_cpuset="0x0000000f" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="6" local_memory="1073741824">
         <page_type size="4096" count="262144"/>
@@ -198,8 +200,6 @@ Group:4 NUMANode:1 PU:4
   <support name="discovery.numa"/>
   <support name="discovery.numa_memory"/>
   <support name="custom.exported_support"/>
-  <info name="Backend" value="Synthetic"/>
-  <info name="SyntheticDescription" value="node:4 pu:4"/>
 </topology>
 ** Topology flag disallowed...
 assuming `node:4 pu:4' is a synthetic topology description