Skip to content

Commit 1c74b37

Browse files
bgoglinbgoglin
committed
doc/images: update some xml source to XML v2
Signed-off-by: Brice Goglin <[email protected]> (cherry picked from commit b0c5d3e)
1 parent 51fcf14 commit 1c74b37

File tree

4 files changed

+189
-188
lines changed

4 files changed

+189
-188
lines changed

‎doc/images/devel09-pci.xml

+50-51
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE topology SYSTEM "hwloc.dtd">
3-
<topology>
4-
<object type="Machine" os_index="0" cpuset="0x0000000f" complete_cpuset="0x0000000f" allowed_cpuset="0x0000000f" nodeset="0x00000003" complete_nodeset="0x00000003" allowed_nodeset="0x00000003">
5-
<page_type size="4096" count="0"/>
6-
<page_type size="2097152" count="0"/>
2+
<!DOCTYPE topology SYSTEM "hwloc2.dtd">
3+
<topology version="2.0">
4+
<object type="Machine" os_index="0" cpuset="0x0000000f" complete_cpuset="0x0000000f" allowed_cpuset="0x0000000f" nodeset="0x00000003" complete_nodeset="0x00000003" allowed_nodeset="0x00000003" gp_index="1">
75
<info name="DMIProductName" value="PowerEdge R410"/>
86
<info name="DMIProductVersion" value=""/>
97
<info name="DMIBoardVendor" value="Dell Inc."/>
@@ -24,97 +22,98 @@
2422
<info name="OSVersion" value="#1 SMP 2009-11-23 12:57:38 +0100"/>
2523
<info name="HostName" value="devel09"/>
2624
<info name="Architecture" value="x86_64"/>
27-
<object type="NUMANode" os_index="0" cpuset="0x00000005" complete_cpuset="0x00000005" allowed_cpuset="0x00000005" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" local_memory="12884901888">
28-
<page_type size="4096" count="3145728"/>
29-
<page_type size="2097152" count="0"/>
30-
<object type="Package" os_index="1" cpuset="0x00000005" complete_cpuset="0x00000005" allowed_cpuset="0x00000005" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001">
31-
<object type="Cache" cpuset="0x00000005" complete_cpuset="0x00000005" allowed_cpuset="0x00000005" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="8388608" depth="3" cache_linesize="64" cache_associativity="16">
32-
<object type="Cache" cpuset="0x00000001" complete_cpuset="0x00000001" allowed_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8">
33-
<object type="Cache" cpuset="0x00000001" complete_cpuset="0x00000001" allowed_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8">
34-
<object type="Core" os_index="0" cpuset="0x00000001" complete_cpuset="0x00000001" allowed_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001">
35-
<object type="PU" os_index="0" cpuset="0x00000001" complete_cpuset="0x00000001" allowed_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
36-
</object>
25+
<object type="Package" os_index="1" cpuset="0x00000005" complete_cpuset="0x00000005" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="4">
26+
<object type="NUMANode" os_index="0" cpuset="0x00000005" complete_cpuset="0x00000005" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="2" local_memory="12884901888">
27+
<page_type size="4096" count="3145728"/>
28+
<page_type size="2097152" count="0"/>
29+
</object>
30+
<object type="L3Cache" cpuset="0x00000005" complete_cpuset="0x00000005" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="5" cache_size="8388608" depth="3" cache_linesize="64" cache_associativity="16" cache_type="0">
31+
<object type="L2Cache" cpuset="0x00000001" complete_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="6" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
32+
<object type="L1Cache" cpuset="0x00000001" complete_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="7" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="0">
33+
<object type="Core" os_index="0" cpuset="0x00000001" complete_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="8">
34+
<object type="PU" os_index="0" cpuset="0x00000001" complete_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="9"/>
3735
</object>
3836
</object>
39-
<object type="Cache" cpuset="0x00000004" complete_cpuset="0x00000004" allowed_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8">
40-
<object type="Cache" cpuset="0x00000004" complete_cpuset="0x00000004" allowed_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8">
41-
<object type="Core" os_index="1" cpuset="0x00000004" complete_cpuset="0x00000004" allowed_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001">
42-
<object type="PU" os_index="2" cpuset="0x00000004" complete_cpuset="0x00000004" allowed_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
43-
</object>
37+
</object>
38+
<object type="L2Cache" cpuset="0x00000004" complete_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="10" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
39+
<object type="L1Cache" cpuset="0x00000004" complete_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="11" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="0">
40+
<object type="Core" os_index="1" cpuset="0x00000004" complete_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="12">
41+
<object type="PU" os_index="2" cpuset="0x00000004" complete_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001" gp_index="13"/>
4442
</object>
4543
</object>
4644
</object>
4745
</object>
48-
<object type="Bridge" os_index="0" bridge_type="0-1" depth="0" bridge_pci="0000:[00-04]">
49-
<object type="Bridge" os_index="16" name="Intel Corporation X58 I/O Hub PCI Express Root Port 1" bridge_type="1-1" depth="0" bridge_pci="0000:[01-01]" pci_busid="0000:00:01.0" pci_type="0604 [8086:3408] [0000:0000] 13" pci_link_speed="0.400000">
46+
<object type="Bridge" os_index="0" gp_index="14" bridge_type="0-1" depth="0" bridge_pci="0000:[00-04]">
47+
<object type="Bridge" os_index="16" gp_index="15" name="Intel Corporation X58 I/O Hub PCI Express Root Port 1" bridge_type="1-1" depth="1" bridge_pci="0000:[01-01]" pci_busid="0000:00:01.0" pci_type="0604 [8086:3408] [0000:0000] 13" pci_link_speed="0.400000">
5048
<info name="PCIVendor" value="Intel Corporation"/>
5149
<info name="PCIDevice" value="X58 I/O Hub PCI Express Root Port 1"/>
52-
<object type="PCIDev" os_index="4096" name="Broadcom Corporation NetXtreme II BCM5716 Gigabit Ethernet" pci_busid="0000:01:00.0" pci_type="0200 [14e4:163b] [0028:008c] 20" pci_link_speed="0.200000">
50+
<object type="PCIDev" os_index="4096" gp_index="16" name="Broadcom Corporation NetXtreme II BCM5716 Gigabit Ethernet" pci_busid="0000:01:00.0" pci_type="0200 [14e4:163b] [0028:008c] 20" pci_link_speed="0.200000">
5351
<info name="PCIVendor" value="Broadcom Corporation"/>
5452
<info name="PCIDevice" value="NetXtreme II BCM5716 Gigabit Ethernet"/>
55-
<object type="OSDev" name="eth0" osdev_type="2">
53+
<object type="OSDev" gp_index="17" name="eth0" osdev_type="2">
5654
<info name="Address" value="00:24:e8:7f:92:68"/>
5755
</object>
5856
</object>
59-
<object type="PCIDev" os_index="4097" name="Broadcom Corporation NetXtreme II BCM5716 Gigabit Ethernet" pci_busid="0000:01:00.1" pci_type="0200 [14e4:163b] [0028:008c] 20" pci_link_speed="0.200000">
57+
<object type="PCIDev" os_index="4097" gp_index="18" name="Broadcom Corporation NetXtreme II BCM5716 Gigabit Ethernet" pci_busid="0000:01:00.1" pci_type="0200 [14e4:163b] [0028:008c] 20" pci_link_speed="0.200000">
6058
<info name="PCIVendor" value="Broadcom Corporation"/>
6159
<info name="PCIDevice" value="NetXtreme II BCM5716 Gigabit Ethernet"/>
62-
<object type="OSDev" name="eth1" osdev_type="2">
60+
<object type="OSDev" gp_index="19" name="eth1" osdev_type="2">
6361
<info name="Address" value="00:24:e8:7f:92:69"/>
6462
</object>
6563
</object>
6664
</object>
67-
<object type="Bridge" os_index="112" name="Intel Corporation X58 I/O Hub PCI Express Root Port 7" bridge_type="1-1" depth="0" bridge_pci="0000:[03-03]" pci_busid="0000:00:07.0" pci_type="0604 [8086:340e] [0000:0000] 13" pci_link_speed="0.200000">
65+
<object type="Bridge" os_index="112" gp_index="20" name="Intel Corporation X58 I/O Hub PCI Express Root Port 7" bridge_type="1-1" depth="1" bridge_pci="0000:[03-03]" pci_busid="0000:00:07.0" pci_type="0604 [8086:340e] [0000:0000] 13" pci_link_speed="0.200000">
6866
<info name="PCIVendor" value="Intel Corporation"/>
6967
<info name="PCIDevice" value="X58 I/O Hub PCI Express Root Port 7"/>
70-
<object type="PCIDev" os_index="12288" name="LSI Logic / Symbios Logic MegaRAID SAS 1078" pci_busid="0000:03:00.0" pci_type="0104 [1000:0060] [0028:000b] 04" pci_link_speed="0.200000">
68+
<object type="PCIDev" os_index="12288" gp_index="21" name="LSI Logic / Symbios Logic MegaRAID SAS 1078" pci_busid="0000:03:00.0" pci_type="0104 [1000:0060] [0028:000b] 04" pci_link_speed="0.200000">
7169
<info name="PCIVendor" value="LSI Logic / Symbios Logic"/>
7270
<info name="PCIDevice" value="MegaRAID SAS 1078"/>
73-
<object type="OSDev" name="sda" osdev_type="0"/>
71+
<object type="OSDev" gp_index="22" name="sda" osdev_type="0"/>
7472
</object>
7573
</object>
76-
<object type="Bridge" os_index="480" name="Intel Corporation 82801 PCI Bridge" bridge_type="1-1" depth="0" bridge_pci="0000:[04-04]" pci_busid="0000:00:1e.0" pci_type="0604 [8086:244e] [0000:0000] 90" pci_link_speed="0.000000">
74+
<object type="Bridge" os_index="480" gp_index="23" name="Intel Corporation 82801 PCI Bridge" bridge_type="1-1" depth="1" bridge_pci="0000:[04-04]" pci_busid="0000:00:1e.0" pci_type="0604 [8086:244e] [0000:0000] 90" pci_link_speed="0.000000">
7775
<info name="PCIVendor" value="Intel Corporation"/>
7876
<info name="PCIDevice" value="82801 PCI Bridge"/>
79-
<object type="PCIDev" os_index="16432" name="Matrox Graphics, Inc. MGA G200eW WPCM450" pci_busid="0000:04:03.0" pci_type="0300 [102b:0532] [0028:008c] 0a" pci_link_speed="0.000000">
77+
<object type="PCIDev" os_index="16432" gp_index="24" name="Matrox Graphics, Inc. MGA G200eW WPCM450" pci_busid="0000:04:03.0" pci_type="0300 [102b:0532] [0028:008c] 0a" pci_link_speed="0.000000">
8078
<info name="PCIVendor" value="Matrox Graphics, Inc."/>
8179
<info name="PCIDevice" value="MGA G200eW WPCM450"/>
8280
</object>
8381
</object>
84-
<object type="PCIDev" os_index="498" name="Intel Corporation 82801JI (ICH10 Family) 4 port SATA IDE Controller" pci_busid="0000:00:1f.2" pci_type="0101 [8086:3a20] [0028:008c] 00" pci_link_speed="0.100000">
82+
<object type="PCIDev" os_index="498" gp_index="25" name="Intel Corporation 82801JI (ICH10 Family) 4 port SATA IDE Controller" pci_busid="0000:00:1f.2" pci_type="0101 [8086:3a20] [0028:008c] 00" pci_link_speed="0.100000">
8583
<info name="PCIVendor" value="Intel Corporation"/>
8684
<info name="PCIDevice" value="82801JI (ICH10 Family) 4 port SATA IDE Controller"/>
8785
</object>
88-
<object type="PCIDev" os_index="331776" name="Mellanox Technologies MT25418 [ConnectX IB DDR, PCIe 2.0 2.5GT/s]" pci_busid="0000:51:00.0" pci_type="0c06 [15b3:634a] [00b3:004a] a0" pci_link_speed="2.000000">
86+
<object type="PCIDev" os_index="331776" gp_index="26" name="Mellanox Technologies MT25418 [ConnectX IB DDR, PCIe 2.0 2.5GT/s]" pci_busid="0000:51:00.0" pci_type="0c06 [15b3:634a] [00b3:004a] a0" pci_link_speed="2.000000">
8987
<info name="PCIVendor" value="Mellanox Technologies"/>
9088
<info name="PCIDevice" value="MT25418 [ConnectX IB DDR, PCIe 2.0 2.5GT/s]"/>
91-
<object type="OSDev" name="ib0" osdev_type="2"/>
92-
<object type="OSDev" name="ib1" osdev_type="2"/>
93-
<object type="OSDev" name="mlx4_0" osdev_type="2"/>
89+
<object type="OSDev" gp_index="27" name="ib0" osdev_type="2"/>
90+
<object type="OSDev" gp_index="28" name="ib1" osdev_type="2"/>
91+
<object type="OSDev" gp_index="29" name="mlx4_0" osdev_type="2"/>
9492
</object>
9593
</object>
9694
</object>
97-
<object type="NUMANode" os_index="1" cpuset="0x0000000a" complete_cpuset="0x0000000a" allowed_cpuset="0x0000000a" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" local_memory="12874317824">
98-
<page_type size="4096" count="3143144"/>
99-
<page_type size="2097152" count="0"/>
100-
<object type="Package" os_index="0" cpuset="0x0000000a" complete_cpuset="0x0000000a" allowed_cpuset="0x0000000a" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002">
101-
<object type="Cache" cpuset="0x0000000a" complete_cpuset="0x0000000a" allowed_cpuset="0x0000000a" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="8388608" depth="3" cache_linesize="64" cache_associativity="16">
102-
<object type="Cache" cpuset="0x00000002" complete_cpuset="0x00000002" allowed_cpuset="0x00000002" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8">
103-
<object type="Cache" cpuset="0x00000002" complete_cpuset="0x00000002" allowed_cpuset="0x00000002" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8">
104-
<object type="Core" os_index="0" cpuset="0x00000002" complete_cpuset="0x00000002" allowed_cpuset="0x00000002" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002">
105-
<object type="PU" os_index="1" cpuset="0x00000002" complete_cpuset="0x00000002" allowed_cpuset="0x00000002" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002"/>
106-
</object>
95+
<object type="Package" os_index="0" cpuset="0x0000000a" complete_cpuset="0x0000000a" nodeset="0x00000002" complete_nodeset="0x00000002" gp_index="32">
96+
<object type="NUMANode" os_index="1" cpuset="0x0000000a" complete_cpuset="0x0000000a" nodeset="0x00000002" complete_nodeset="0x00000002" gp_index="30" local_memory="12874317824">
97+
<page_type size="4096" count="3143144"/>
98+
<page_type size="2097152" count="0"/>
99+
</object>
100+
<object type="L3Cache" cpuset="0x0000000a" complete_cpuset="0x0000000a" nodeset="0x00000002" complete_nodeset="0x00000002" gp_index="33" cache_size="8388608" depth="3" cache_linesize="64" cache_associativity="16" cache_type="0">
101+
<object type="L2Cache" cpuset="0x00000002" complete_cpuset="0x00000002" nodeset="0x00000002" complete_nodeset="0x00000002" gp_index="34" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
102+
<object type="L1Cache" cpuset="0x00000002" complete_cpuset="0x00000002" nodeset="0x00000002" complete_nodeset="0x00000002" gp_index="35" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="0">
103+
<object type="Core" os_index="0" cpuset="0x00000002" complete_cpuset="0x00000002" nodeset="0x00000002" complete_nodeset="0x00000002" gp_index="36">
104+
<object type="PU" os_index="1" cpuset="0x00000002" complete_cpuset="0x00000002" nodeset="0x00000002" complete_nodeset="0x00000002" gp_index="37"/>
107105
</object>
108106
</object>
109-
<object type="Cache" cpuset="0x00000008" complete_cpuset="0x00000008" allowed_cpuset="0x00000008" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8">
110-
<object type="Cache" cpuset="0x00000008" complete_cpuset="0x00000008" allowed_cpuset="0x00000008" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8">
111-
<object type="Core" os_index="1" cpuset="0x00000008" complete_cpuset="0x00000008" allowed_cpuset="0x00000008" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002">
112-
<object type="PU" os_index="3" cpuset="0x00000008" complete_cpuset="0x00000008" allowed_cpuset="0x00000008" nodeset="0x00000002" complete_nodeset="0x00000002" allowed_nodeset="0x00000002"/>
113-
</object>
107+
</object>
108+
<object type="L2Cache" cpuset="0x00000008" complete_cpuset="0x00000008" nodeset="0x00000002" complete_nodeset="0x00000002" gp_index="38" cache_size="262144" depth="2" cache_linesize="64" cache_associativity="8" cache_type="0">
109+
<object type="L1Cache" cpuset="0x00000008" complete_cpuset="0x00000008" nodeset="0x00000002" complete_nodeset="0x00000002" gp_index="39" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="0">
110+
<object type="Core" os_index="1" cpuset="0x00000008" complete_cpuset="0x00000008" nodeset="0x00000002" complete_nodeset="0x00000002" gp_index="40">
111+
<object type="PU" os_index="3" cpuset="0x00000008" complete_cpuset="0x00000008" nodeset="0x00000002" complete_nodeset="0x00000002" gp_index="41"/>
114112
</object>
115113
</object>
116114
</object>
117115
</object>
118116
</object>
119117
</object>
118+
<support name="custom.exported_support"/>
120119
</topology>

0 commit comments

Comments
 (0)