Since kernel version 4.7, processor frequency information is available on S390. Let's adjust the parser so this information shows up for virsh nodeinfo: # virsh nodeinfo CPU model: s390x CPU(s): 8 CPU frequency: 5000 MHz CPU socket(s): 1 Core(s) per socket: 8 Thread(s) per core: 1 NUMA cell(s): 1 Memory size: 16273908 KiB Reviewed-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com&gt; Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com&gt; Signed-off-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com&gt; --- src/util/virhostcpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 1c9ee592..24f0d936 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -598,6 +598,8 @@ virHostCPUParseFrequency(FILE *cpuinfo, prefix = "cpu MHz"; else if (ARCH_IS_PPC(arch)) prefix = "clock"; + else if (ARCH_IS_S390(arch)) + prefix = "cpu MHz dynamic"; if (!prefix) { VIR_WARN("%s is not supported by the %s parser", -- 2.13.4

On 01/04/2018 03:56 PM, John Ferlan wrote: Doh - should have read the cover letter <facepalm> - this goes on top of Andrea's changes... Sometimes it's just better to wait and/or provide review to the series you trying to use! John

Let's add a testcase for a S390 system running kernel version 4.14 on LPAR. Reviewed-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com&gt; Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com&gt; Signed-off-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com&gt; --- .../linux-s390x-with-frequency.cpuinfo | 52 ++++++++++++++++++++++ .../linux-s390x-with-frequency.expected | 1 + .../linux-with-frequency/cpu/cpu0/online | 1 + .../linux-with-frequency/cpu/cpu0/topology/book_id | 1 + .../cpu/cpu0/topology/book_siblings | 1 + .../cpu/cpu0/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu0/topology/core_id | 1 + .../cpu/cpu0/topology/core_siblings | 1 + .../cpu/cpu0/topology/core_siblings_list | 1 + .../cpu/cpu0/topology/drawer_id | 1 + .../cpu/cpu0/topology/drawer_siblings | 1 + .../cpu/cpu0/topology/drawer_siblings_list | 1 + .../cpu/cpu0/topology/physical_package_id | 1 + .../cpu/cpu0/topology/thread_siblings | 1 + .../cpu/cpu0/topology/thread_siblings_list | 1 + .../linux-with-frequency/cpu/cpu1/online | 1 + .../linux-with-frequency/cpu/cpu1/topology/book_id | 1 + .../cpu/cpu1/topology/book_siblings | 1 + .../cpu/cpu1/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu1/topology/core_id | 1 + .../cpu/cpu1/topology/core_siblings | 1 + .../cpu/cpu1/topology/core_siblings_list | 1 + .../cpu/cpu1/topology/drawer_id | 1 + .../cpu/cpu1/topology/drawer_siblings | 1 + .../cpu/cpu1/topology/drawer_siblings_list | 1 + .../cpu/cpu1/topology/physical_package_id | 1 + .../cpu/cpu1/topology/thread_siblings | 1 + .../cpu/cpu1/topology/thread_siblings_list | 1 + .../linux-with-frequency/cpu/cpu2/online | 1 + .../linux-with-frequency/cpu/cpu2/topology/book_id | 1 + .../cpu/cpu2/topology/book_siblings | 1 + .../cpu/cpu2/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu2/topology/core_id | 1 + .../cpu/cpu2/topology/core_siblings | 1 + .../cpu/cpu2/topology/core_siblings_list | 1 + .../cpu/cpu2/topology/drawer_id | 1 + .../cpu/cpu2/topology/drawer_siblings | 1 + .../cpu/cpu2/topology/drawer_siblings_list | 1 + .../cpu/cpu2/topology/physical_package_id | 1 + .../cpu/cpu2/topology/thread_siblings | 1 + .../cpu/cpu2/topology/thread_siblings_list | 1 + .../linux-with-frequency/cpu/cpu3/online | 1 + .../linux-with-frequency/cpu/cpu3/topology/book_id | 1 + .../cpu/cpu3/topology/book_siblings | 1 + .../cpu/cpu3/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu3/topology/core_id | 1 + .../cpu/cpu3/topology/core_siblings | 1 + .../cpu/cpu3/topology/core_siblings_list | 1 + .../cpu/cpu3/topology/drawer_id | 1 + .../cpu/cpu3/topology/drawer_siblings | 1 + .../cpu/cpu3/topology/drawer_siblings_list | 1 + .../cpu/cpu3/topology/physical_package_id | 1 + .../cpu/cpu3/topology/thread_siblings | 1 + .../cpu/cpu3/topology/thread_siblings_list | 1 + .../linux-with-frequency/cpu/cpu4/online | 1 + .../linux-with-frequency/cpu/cpu4/topology/book_id | 1 + .../cpu/cpu4/topology/book_siblings | 1 + .../cpu/cpu4/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu4/topology/core_id | 1 + .../cpu/cpu4/topology/core_siblings | 1 + .../cpu/cpu4/topology/core_siblings_list | 1 + .../cpu/cpu4/topology/drawer_id | 1 + .../cpu/cpu4/topology/drawer_siblings | 1 + .../cpu/cpu4/topology/drawer_siblings_list | 1 + .../cpu/cpu4/topology/physical_package_id | 1 + .../cpu/cpu4/topology/thread_siblings | 1 + .../cpu/cpu4/topology/thread_siblings_list | 1 + .../linux-with-frequency/cpu/cpu5/online | 1 + .../linux-with-frequency/cpu/cpu5/topology/book_id | 1 + .../cpu/cpu5/topology/book_siblings | 1 + .../cpu/cpu5/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu5/topology/core_id | 1 + .../cpu/cpu5/topology/core_siblings | 1 + .../cpu/cpu5/topology/core_siblings_list | 1 + .../cpu/cpu5/topology/drawer_id | 1 + .../cpu/cpu5/topology/drawer_siblings | 1 + .../cpu/cpu5/topology/drawer_siblings_list | 1 + .../cpu/cpu5/topology/physical_package_id | 1 + .../cpu/cpu5/topology/thread_siblings | 1 + .../cpu/cpu5/topology/thread_siblings_list | 1 + .../linux-with-frequency/cpu/cpu6/online | 1 + .../linux-with-frequency/cpu/cpu6/topology/book_id | 1 + .../cpu/cpu6/topology/book_siblings | 1 + .../cpu/cpu6/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu6/topology/core_id | 1 + .../cpu/cpu6/topology/core_siblings | 1 + .../cpu/cpu6/topology/core_siblings_list | 1 + .../cpu/cpu6/topology/drawer_id | 1 + .../cpu/cpu6/topology/drawer_siblings | 1 + .../cpu/cpu6/topology/drawer_siblings_list | 1 + .../cpu/cpu6/topology/physical_package_id | 1 + .../cpu/cpu6/topology/thread_siblings | 1 + .../cpu/cpu6/topology/thread_siblings_list | 1 + .../linux-with-frequency/cpu/cpu7/online | 1 + .../linux-with-frequency/cpu/cpu7/topology/book_id | 1 + .../cpu/cpu7/topology/book_siblings | 1 + .../cpu/cpu7/topology/book_siblings_list | 1 + .../linux-with-frequency/cpu/cpu7/topology/core_id | 1 + .../cpu/cpu7/topology/core_siblings | 1 + .../cpu/cpu7/topology/core_siblings_list | 1 + .../cpu/cpu7/topology/drawer_id | 1 + .../cpu/cpu7/topology/drawer_siblings | 1 + .../cpu/cpu7/topology/drawer_siblings_list | 1 + .../cpu/cpu7/topology/physical_package_id | 1 + .../cpu/cpu7/topology/thread_siblings | 1 + .../cpu/cpu7/topology/thread_siblings_list | 1 + .../virhostcpudata/linux-with-frequency/cpu/online | 1 + .../linux-with-frequency/cpu/present | 1 + tests/virhostcputest.c | 1 + 109 files changed, 160 insertions(+) create mode 100644 tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo create mode 100644 tests/virhostcpudata/linux-s390x-with-frequency.expected create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/online create mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/present diff --git a/tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo b/tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo new file mode 100644 index 00000000..0edc371d --- /dev/null +++ b/tests/virhostcpudata/linux-s390x-with-frequency.cpuinfo @@ -0,0 +1,52 @@ +vendor_id : IBM/S390 +# processors : 8 +bogomips per cpu: 20325.00 +max thread id : 1 +features : esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx sie +facilities : 0 1 2 3 4 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 30 31 32 33 34 35 36 37 40 41 42 43 44 45 46 47 48 49 50 51 52 53 55 57 64 65 66 67 68 69 70 71 72 73 75 76 77 78 80 128 129 131 132 142 143 +cache0 : level=1 type=Data scope=Private size=128K line_size=256 associativity=8 +cache1 : level=1 type=Instruction scope=Private size=96K line_size=256 associativity=6 +cache2 : level=2 type=Data scope=Private size=2048K line_size=256 associativity=8 +cache3 : level=2 type=Instruction scope=Private size=2048K line_size=256 associativity=8 +cache4 : level=3 type=Unified scope=Shared size=65536K line_size=256 associativity=16 +cache5 : level=4 type=Unified scope=Shared size=491520K line_size=256 associativity=30 +processor 0: version = 00, identification = 145F07, machine = 2964 +processor 1: version = 00, identification = 145F07, machine = 2964 +processor 2: version = 00, identification = 145F07, machine = 2964 +processor 3: version = 00, identification = 145F07, machine = 2964 +processor 4: version = 00, identification = 145F07, machine = 2964 +processor 5: version = 00, identification = 145F07, machine = 2964 +processor 6: version = 00, identification = 145F07, machine = 2964 +processor 7: version = 00, identification = 145F07, machine = 2964 + +cpu number : 0 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 + +cpu number : 1 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 + +cpu number : 2 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 + +cpu number : 3 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 + +cpu number : 4 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 + +cpu number : 5 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 + +cpu number : 6 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 + +cpu number : 7 +cpu MHz dynamic : 5000 +cpu MHz static : 5000 diff --git a/tests/virhostcpudata/linux-s390x-with-frequency.expected b/tests/virhostcpudata/linux-s390x-with-frequency.expected new file mode 100644 index 00000000..aeb595a2 --- /dev/null +++ b/tests/virhostcpudata/linux-s390x-with-frequency.expected @@ -0,0 +1 @@ +CPUs: 8/8, MHz: 5000, Nodes: 1, Sockets: 1, Cores: 8, Threads: 1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/online b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/online new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/online @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_id new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_id @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/book_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_id new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_id new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_id @@ -0,0 +1 @@ +4 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/drawer_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/physical_package_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/physical_package_id new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/physical_package_id @@ -0,0 +1 @@ +2 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings new file mode 100644 index 00000000..176d3d66 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings_list new file mode 100644 index 00000000..8b0fab86 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings_list @@ -0,0 +1 @@ +0-1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/online b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/online new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/online @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_id new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_id @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/book_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_id new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_id new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_id @@ -0,0 +1 @@ +4 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/drawer_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/physical_package_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/physical_package_id new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/physical_package_id @@ -0,0 +1 @@ +2 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings new file mode 100644 index 00000000..176d3d66 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings_list new file mode 100644 index 00000000..8b0fab86 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings_list @@ -0,0 +1 @@ +0-1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/online b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/online new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/online @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_id new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_id @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/book_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_id new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_id @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_id new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_id @@ -0,0 +1 @@ +4 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/drawer_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/physical_package_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/physical_package_id new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/physical_package_id @@ -0,0 +1 @@ +2 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings new file mode 100644 index 00000000..b0f137de --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,0000000c diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings_list new file mode 100644 index 00000000..7a985754 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings_list @@ -0,0 +1 @@ +2-3 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/online b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/online new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/online @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_id new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_id @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/book_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_id new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_id @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_id new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_id @@ -0,0 +1 @@ +4 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/drawer_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/physical_package_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/physical_package_id new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/physical_package_id @@ -0,0 +1 @@ +2 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings new file mode 100644 index 00000000..b0f137de --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,0000000c diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings_list new file mode 100644 index 00000000..7a985754 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings_list @@ -0,0 +1 @@ +2-3 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/online b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/online new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/online @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_id new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_id @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/book_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_id new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_id @@ -0,0 +1 @@ +2 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_id new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_id @@ -0,0 +1 @@ +4 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/drawer_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/physical_package_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/physical_package_id new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/physical_package_id @@ -0,0 +1 @@ +2 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings new file mode 100644 index 00000000..294472bc --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000030 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings_list new file mode 100644 index 00000000..e66d883a --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings_list @@ -0,0 +1 @@ +4-5 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/online b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/online new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/online @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_id new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_id @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/book_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_id new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_id @@ -0,0 +1 @@ +2 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_id new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_id @@ -0,0 +1 @@ +4 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/drawer_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/physical_package_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/physical_package_id new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/physical_package_id @@ -0,0 +1 @@ +2 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings new file mode 100644 index 00000000..294472bc --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000030 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings_list new file mode 100644 index 00000000..e66d883a --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings_list @@ -0,0 +1 @@ +4-5 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/online b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/online new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/online @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_id new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_id @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/book_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_id new file mode 100644 index 00000000..00750edc --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_id @@ -0,0 +1 @@ +3 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_id new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_id @@ -0,0 +1 @@ +4 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/drawer_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/physical_package_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/physical_package_id new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/physical_package_id @@ -0,0 +1 @@ +2 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings new file mode 100644 index 00000000..c885e37d --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000c0 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings_list new file mode 100644 index 00000000..fdd9f375 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings_list @@ -0,0 +1 @@ +6-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/online b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/online new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/online @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_id new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_id @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/book_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_id new file mode 100644 index 00000000..00750edc --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_id @@ -0,0 +1 @@ +3 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_id new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_id @@ -0,0 +1 @@ +4 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_siblings new file mode 100644 index 00000000..be630d4c --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_siblings_list new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/drawer_siblings_list @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/physical_package_id b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/physical_package_id new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/physical_package_id @@ -0,0 +1 @@ +2 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings new file mode 100644 index 00000000..c885e37d --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000c0 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings_list new file mode 100644 index 00000000..fdd9f375 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings_list @@ -0,0 +1 @@ +6-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/online b/tests/virhostcpudata/linux-with-frequency/cpu/online new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/online @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/present b/tests/virhostcpudata/linux-with-frequency/cpu/present new file mode 100644 index 00000000..74fc2fb6 --- /dev/null +++ b/tests/virhostcpudata/linux-with-frequency/cpu/present @@ -0,0 +1 @@ +0-7 diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index d3ee1846..cb318df6 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -247,6 +247,7 @@ mymain(void) {"subcores2", VIR_ARCH_PPC64}, /* subcores, invalid configuration */ {"subcores3", VIR_ARCH_PPC64}, + {"with-frequency", VIR_ARCH_S390X}, }; if (virInitialize() < 0) -- 2.13.4

On 12/19/2017 05:08 AM, Bjoern Walk wrote: Should these be split? Reason I ask is if n >= ret->nprocessor, then going to cleanup results in returning a failure. That leads to an eventual generic command failed for some reason. Of course that reason shouldn't be possible, but since this is a CYA exercise, the check should have a specific error message - similar to what one would get if other calls failed... Other virSysinfoParseS390Line callers never check whether the returned 4th argument is NULL - should they? or is the !mhz check here (and the next one) superfluous? I note the @ncpu one above doesn't have it either. In the long run, who cares if it's NULL? FWIW, you could remove @mhz and replace with a "virSysinfoProcessorDefPtr processor;" definition followed by an appropriately placed "processsor = &ret->processor[n];", and then and assign directly to &processor->{external_clock|processor_max_speed} John

On 01/08/2018 03:39 AM, Bjoern Walk wrote: When I first read, I read it "out of context"... If the first call fails, then you get an error, if the second call fails, then there is no error so the first question that pops in my mind is - should we provide an error message in that case? I would hope that n >= ret->nprocessor couldn't be true considering what was recently read a few lines earlier and if the number was wrong here, then the cpuinfo output would be AFU'd, right? I don't have picture in my mind of what's being processed, but didn't want to ignore this possible condition. Since @result would be -1, then going to cleanup at this point would be a failure. The question thus becomes should we ignore (and return 0) when cpuinfo is bad and maybe toss out a VIR_DEBUG or should we error out and throw everything away? The one thing with waiting for some caller to determine hostsysinfo is not available and an error generated is that we lose the reason why. I defer to you to decide what the best course of action is. It isn't that important... When I first saw I thought should there be a VIR_STEAL_PTR usage, but reading for context removed that thought quickly. John

On 01/09/2018 04:08 AM, Bjoern Walk wrote: Cannot disagree with either point! Thinking partially in terms of something Andrea posted as a result of something I commented on: https://www.redhat.com/archives/libvir-list/2018-January/msg00240.html Maybe we should take the approach of leaving it as zero if we cannot find what we're looking for... So the above changes to if ((tmp_base = strstr(tmp_base, "cpu MHz dynamic")) && (virSysinfoParseS390Line(tmp_base..., &mhz)) xxxx = mhz; IOW: Update the value if both pass and do nothing if one or the other fails. If both pass then mhz won't be leaked because we'll save it. BTW: Since Andrea has pushed and patches 1 & 2 were R-B'd, I've pushed them. So it'll just be this third patch with adjustments. John