[libvirt] [PATCH 5/5] tests: add host CPU data files for validating die_id

[Daniel Henrique Barboza]

This patch made git am complain about whitespace errors:

Applying: tests: add host CPU data files for validating die_id
.git/rebase-apply/patch:2068: new blank line at EOF.
+
warning: 1 line adds whitespace errors.


If I have to guess, I think it's right ...



On 12/19/19 9:42 AM, Daniel P. Berrangé wrote:
> Only Cascadelake-AP CPUs appear to report "die_id" values != 0 on Linux
> right now - AMD EPYC's don't report "die_id" (at least with Fedora 31
> kernel). Lacking access to Cascadelake-AP CPUs, this test data was from
> a Fedora 31 QEMU guest launched with
> 
>   -cpu qemu64 -smp sockets=2,dies=3,cores=2,threads=1
> 
> Ideally we'd replace this data with some from a real machine reporting
> "die_id", to ensure we're not mislead by QEMU's impl.
> 
> Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
> ---
>   .../linux-basic-dies/system/cpu               |   1 +
>   .../linux-basic-dies/system/node              |   1 +
>   .../vircaps-x86_64-basic-dies.xml             |  35 ++
>   tests/vircaps2xmltest.c                       |   1 +
>   .../cpu/cpu0/topology/core_cpus               |   1 +

[...]
> diff --git a/tests/virhostcpudata/linux-x86_64-with-die.cpuinfo b/tests/virhostcpudata/linux-x86_64-with-die.cpuinfo
> new file mode 100644
> index 0000000000..027dc6a037
> --- /dev/null
> +++ b/tests/virhostcpudata/linux-x86_64-with-die.cpuinfo
> @@ -0,0 +1,324 @@
> +processor	: 0
> +vendor_id	: GenuineIntel
> +cpu family	: 6
> +model		: 6
> +model name	: QEMU Virtual CPU version 2.5+
> +stepping	: 3
> +microcode	: 0x1
> +cpu MHz		: 1897.801
> +cache size	: 16384 KB
> +physical id	: 0
> +siblings	: 6
> +core id		: 0
> +cpu cores	: 6
> +apicid		: 0
> +initial apicid	: 0
> +fpu		: yes
> +fpu_exception	: yes
> +cpuid level	: 31
> +wp		: yes
> +flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
> +bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
> +bogomips	: 3795.60
> +clflush size	: 64
> +cache_alignment	: 64
> +address sizes	: 40 bits physical, 48 bits virtual
> +power management:
> +
> +processor	: 1
> +vendor_id	: GenuineIntel
> +cpu family	: 6
> +model		: 6
> +model name	: QEMU Virtual CPU version 2.5+
> +stepping	: 3
> +microcode	: 0x1
> +cpu MHz		: 1897.801
> +cache size	: 16384 KB
> +physical id	: 0
> +siblings	: 6
> +core id		: 1
> +cpu cores	: 6
> +apicid		: 1
> +initial apicid	: 1
> +fpu		: yes
> +fpu_exception	: yes
> +cpuid level	: 31
> +wp		: yes
> +flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
> +bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
> +bogomips	: 3795.60
> +clflush size	: 64
> +cache_alignment	: 64
> +address sizes	: 40 bits physical, 48 bits virtual
> +power management:
> +
> +processor	: 2
> +vendor_id	: GenuineIntel
> +cpu family	: 6
> +model		: 6
> +model name	: QEMU Virtual CPU version 2.5+
> +stepping	: 3
> +microcode	: 0x1
> +cpu MHz		: 1897.801
> +cache size	: 16384 KB
> +physical id	: 0
> +siblings	: 6
> +core id		: 0
> +cpu cores	: 6
> +apicid		: 2
> +initial apicid	: 2
> +fpu		: yes
> +fpu_exception	: yes
> +cpuid level	: 31
> +wp		: yes
> +flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
> +bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
> +bogomips	: 3795.60
> +clflush size	: 64
> +cache_alignment	: 64
> +address sizes	: 40 bits physical, 48 bits virtual
> +power management:
> +
> +processor	: 3
> +vendor_id	: GenuineIntel
> +cpu family	: 6
> +model		: 6
> +model name	: QEMU Virtual CPU version 2.5+
> +stepping	: 3
> +microcode	: 0x1
> +cpu MHz		: 1897.801
> +cache size	: 16384 KB
> +physical id	: 0
> +siblings	: 6
> +core id		: 1
> +cpu cores	: 6
> +apicid		: 3
> +initial apicid	: 3
> +fpu		: yes
> +fpu_exception	: yes
> +cpuid level	: 31
> +wp		: yes
> +flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
> +bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
> +bogomips	: 3795.60
> +clflush size	: 64
> +cache_alignment	: 64
> +address sizes	: 40 bits physical, 48 bits virtual
> +power management:
> +
> +processor	: 4
> +vendor_id	: GenuineIntel
> +cpu family	: 6
> +model		: 6
> +model name	: QEMU Virtual CPU version 2.5+
> +stepping	: 3
> +microcode	: 0x1
> +cpu MHz		: 1897.801
> +cache size	: 16384 KB
> +physical id	: 0
> +siblings	: 6
> +core id		: 0
> +cpu cores	: 6
> +apicid		: 4
> +initial apicid	: 4
> +fpu		: yes
> +fpu_exception	: yes
> +cpuid level	: 31
> +wp		: yes
> +flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
> +bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
> +bogomips	: 3795.60
> +clflush size	: 64
> +cache_alignment	: 64
> +address sizes	: 40 bits physical, 48 bits virtual
> +power management:
> +
> +processor	: 5
> +vendor_id	: GenuineIntel
> +cpu family	: 6
> +model		: 6
> +model name	: QEMU Virtual CPU version 2.5+
> +stepping	: 3
> +microcode	: 0x1
> +cpu MHz		: 1897.801
> +cache size	: 16384 KB
> +physical id	: 0
> +siblings	: 6
> +core id		: 1
> +cpu cores	: 6
> +apicid		: 5
> +initial apicid	: 5
> +fpu		: yes
> +fpu_exception	: yes
> +cpuid level	: 31
> +wp		: yes
> +flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
> +bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
> +bogomips	: 3795.60
> +clflush size	: 64
> +cache_alignment	: 64
> +address sizes	: 40 bits physical, 48 bits virtual
> +power management:
> +
> +processor	: 6
> +vendor_id	: GenuineIntel
> +cpu family	: 6
> +model		: 6
> +model name	: QEMU Virtual CPU version 2.5+
> +stepping	: 3
> +microcode	: 0x1
> +cpu MHz		: 1897.801
> +cache size	: 16384 KB
> +physical id	: 1
> +siblings	: 6
> +core id		: 0
> +cpu cores	: 6
> +apicid		: 8
> +initial apicid	: 8
> +fpu		: yes
> +fpu_exception	: yes
> +cpuid level	: 31
> +wp		: yes
> +flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
> +bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
> +bogomips	: 3795.60
> +clflush size	: 64
> +cache_alignment	: 64
> +address sizes	: 40 bits physical, 48 bits virtual
> +power management:
> +
> +processor	: 7
> +vendor_id	: GenuineIntel
> +cpu family	: 6
> +model		: 6
> +model name	: QEMU Virtual CPU version 2.5+
> +stepping	: 3
> +microcode	: 0x1
> +cpu MHz		: 1897.801
> +cache size	: 16384 KB
> +physical id	: 1
> +siblings	: 6
> +core id		: 1
> +cpu cores	: 6
> +apicid		: 9
> +initial apicid	: 9
> +fpu		: yes
> +fpu_exception	: yes
> +cpuid level	: 31
> +wp		: yes
> +flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
> +bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
> +bogomips	: 3795.60
> +clflush size	: 64
> +cache_alignment	: 64
> +address sizes	: 40 bits physical, 48 bits virtual
> +power management:
> +
> +processor	: 8
> +vendor_id	: GenuineIntel
> +cpu family	: 6
> +model		: 6
> +model name	: QEMU Virtual CPU version 2.5+
> +stepping	: 3
> +microcode	: 0x1
> +cpu MHz		: 1897.801
> +cache size	: 16384 KB
> +physical id	: 1
> +siblings	: 6
> +core id		: 0
> +cpu cores	: 6
> +apicid		: 10
> +initial apicid	: 10
> +fpu		: yes
> +fpu_exception	: yes
> +cpuid level	: 31
> +wp		: yes
> +flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
> +bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
> +bogomips	: 3795.60
> +clflush size	: 64
> +cache_alignment	: 64
> +address sizes	: 40 bits physical, 48 bits virtual
> +power management:
> +
> +processor	: 9
> +vendor_id	: GenuineIntel
> +cpu family	: 6
> +model		: 6
> +model name	: QEMU Virtual CPU version 2.5+
> +stepping	: 3
> +microcode	: 0x1
> +cpu MHz		: 1897.801
> +cache size	: 16384 KB
> +physical id	: 1
> +siblings	: 6
> +core id		: 1
> +cpu cores	: 6
> +apicid		: 11
> +initial apicid	: 11
> +fpu		: yes
> +fpu_exception	: yes
> +cpuid level	: 31
> +wp		: yes
> +flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
> +bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
> +bogomips	: 3795.60
> +clflush size	: 64
> +cache_alignment	: 64
> +address sizes	: 40 bits physical, 48 bits virtual
> +power management:
> +
> +processor	: 10
> +vendor_id	: GenuineIntel
> +cpu family	: 6
> +model		: 6
> +model name	: QEMU Virtual CPU version 2.5+
> +stepping	: 3
> +microcode	: 0x1
> +cpu MHz		: 1897.801
> +cache size	: 16384 KB
> +physical id	: 1
> +siblings	: 6
> +core id		: 0
> +cpu cores	: 6
> +apicid		: 12
> +initial apicid	: 12
> +fpu		: yes
> +fpu_exception	: yes
> +cpuid level	: 31
> +wp		: yes
> +flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
> +bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
> +bogomips	: 3795.60
> +clflush size	: 64
> +cache_alignment	: 64
> +address sizes	: 40 bits physical, 48 bits virtual
> +power management:
> +
> +processor	: 11
> +vendor_id	: GenuineIntel
> +cpu family	: 6
> +model		: 6
> +model name	: QEMU Virtual CPU version 2.5+
> +stepping	: 3
> +microcode	: 0x1
> +cpu MHz		: 1897.801
> +cache size	: 16384 KB
> +physical id	: 1
> +siblings	: 6
> +core id		: 1
> +cpu cores	: 6
> +apicid		: 13
> +initial apicid	: 13
> +fpu		: yes
> +fpu_exception	: yes
> +cpuid level	: 31
> +wp		: yes
> +flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
> +bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
> +bogomips	: 3795.60
> +clflush size	: 64
> +cache_alignment	: 64
> +address sizes	: 40 bits physical, 48 bits virtual
> +power management:
> +

Here ^