[libvirt] [PATCH 0/4] Couple of nodeinfo enhancements

[Michal Privoznik]

On 20.06.2014 13:40, Ján Tomko wrote:
> On 06/17/2014 02:48 PM, Michal Privoznik wrote:
>> Look at the patches :P
>>
>
> :P
>
>> Michal Privoznik (4):
>>    nodeinfo: Introduce @arch to linuxNodeInfoCPUPopulate
>>    virNodeParseNode: Propagate host architecture
>>    nodeinfotest: Print error if cpuinfo file can't be opened
>>    virNodeParseSocket: Take ARM into account
>>
>>   cfg.mk                                             |   2 +-
>>   src/nodeinfo.c                                     | 199 +++++++++++----------
>>   src/nodeinfopriv.h                                 |   1 +
>>   .../nodeinfodata/linux-armv6l-raspberrypi.cpuinfo  |  12 ++
>>   .../nodeinfodata/linux-armv6l-raspberrypi.expected |   1 +
>>   .../linux-raspberrypi/cpu/cpu0/topology/core_id    |   1 +
>>   .../cpu/cpu0/topology/core_siblings                |   1 +
>>   .../cpu/cpu0/topology/core_siblings_list           |   1 +
>>   .../cpu/cpu0/topology/physical_package_id          |   1 +
>>   .../cpu/cpu0/topology/thread_siblings              |   1 +
>>   .../cpu/cpu0/topology/thread_siblings_list         |   1 +
>>   .../linux-raspberrypi/cpu/cpuidle/current_driver   |   1 +
>>   .../cpu/cpuidle/current_governor_ro                |   1 +
>>   .../nodeinfodata/linux-raspberrypi/cpu/kernel_max  |   1 +
>>   tests/nodeinfodata/linux-raspberrypi/cpu/offline   |   1 +
>>   tests/nodeinfodata/linux-raspberrypi/cpu/online    |   1 +
>>   tests/nodeinfodata/linux-raspberrypi/cpu/possible  |   1 +
>>   tests/nodeinfodata/linux-raspberrypi/cpu/present   |   1 +
>>   ...86-test1.cpuinfo => linux-x86_64-test1.cpuinfo} |   0
>>   ...-test1.expected => linux-x86_64-test1.expected} |   0
>>   ...86-test2.cpuinfo => linux-x86_64-test2.cpuinfo} |   0
>>   ...-test2.expected => linux-x86_64-test2.expected} |   0
>>   ...86-test3.cpuinfo => linux-x86_64-test3.cpuinfo} |   0
>>   ...-test3.expected => linux-x86_64-test3.expected} |   0
>>   ...86-test4.cpuinfo => linux-x86_64-test4.cpuinfo} |   0
>>   ...-test4.expected => linux-x86_64-test4.expected} |   0
>>   ...86-test5.cpuinfo => linux-x86_64-test5.cpuinfo} |   0
>>   ...-test5.expected => linux-x86_64-test5.expected} |   0
>>   ...86-test6.cpuinfo => linux-x86_64-test6.cpuinfo} |   0
>>   ...-test6.expected => linux-x86_64-test6.expected} |   0
>>   ...86-test7.cpuinfo => linux-x86_64-test7.cpuinfo} |   0
>>   ...-test7.expected => linux-x86_64-test7.expected} |   0
>>   ...86-test8.cpuinfo => linux-x86_64-test8.cpuinfo} |   0
>>   ...-test8.expected => linux-x86_64-test8.expected} |   0
>>   tests/nodeinfotest.c                               |  63 ++++---
>>   35 files changed, 164 insertions(+), 127 deletions(-)
>>   create mode 100644 tests/nodeinfodata/linux-armv6l-raspberrypi.cpuinfo
>>   create mode 100644 tests/nodeinfodata/linux-armv6l-raspberrypi.expected
>>   create mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/cpu0/topology/core_id
>>   create mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/cpu0/topology/core_siblings
>>   create mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/cpu0/topology/core_siblings_list
>>   create mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/cpu0/topology/physical_package_id
>>   create mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/cpu0/topology/thread_siblings
>>   create mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/cpu0/topology/thread_siblings_list
>>   create mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver
>>   create mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro
>>   create mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/kernel_max
>>   create mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/offline
>>   create mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/online
>>   create mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/possible
>>   create mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/present
>>   rename tests/nodeinfodata/{linux-x86-test1.cpuinfo => linux-x86_64-test1.cpuinfo} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test1.expected => linux-x86_64-test1.expected} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test2.cpuinfo => linux-x86_64-test2.cpuinfo} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test2.expected => linux-x86_64-test2.expected} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test3.cpuinfo => linux-x86_64-test3.cpuinfo} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test3.expected => linux-x86_64-test3.expected} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test4.cpuinfo => linux-x86_64-test4.cpuinfo} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test4.expected => linux-x86_64-test4.expected} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test5.cpuinfo => linux-x86_64-test5.cpuinfo} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test5.expected => linux-x86_64-test5.expected} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test6.cpuinfo => linux-x86_64-test6.cpuinfo} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test6.expected => linux-x86_64-test6.expected} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test7.cpuinfo => linux-x86_64-test7.cpuinfo} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test7.expected => linux-x86_64-test7.expected} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test8.cpuinfo => linux-x86_64-test8.cpuinfo} (100%)
>>   rename tests/nodeinfodata/{linux-x86-test8.expected => linux-x86_64-test8.expected} (100%)
>>
>
> Fails syntax-check for me:
> tests/nodeinfodata/linux-armv6l-raspberrypi.cpuinfo:3:Features        : swp
> half thumb fastmult vfp edsp java tls
> maint.mk: found trailing blank(s)

I'm undecided how to fix this. The cpuinfo file is pure copy&paste from 
the /proc/cpuinfo on my Raspberry which does contain the trailing 
whitespace. So while I'd like to keep the cpuinfo in sync with its 
origin, it's causing the syntax-check error. So maybe add a syntax-check 
rule exception?


exclude_file_name_regexp--sc_trailing_blank = \
   /qemuhelpdata/|/sysinfodata/.*\.data$$

>
> ACK series with that fixed
>
> Also, defining and using macros like:
> # define ARCH_IS_X86(arch)  ((arch) == VIR_ARCH_X86_64 ||\
>                               (arch) == VIR_ARCH_I686)

Clever idea. I'll do that.

>
> for PPC, S390 and ARM could make the code more readable.
>
> Jan
>

Michal