test: Skip CPUID.(EAX=1FH,ECX=2) in test_cpu_config_dump_vs_actual

CPUID leaf 1FH is a preferred superset to CPUID leaf 0BH. For the same
reason as CPUID leaf 0BH, the subleaf 2 should be skipped if guest
userspace cpuid command enumerates it.

Signed-off-by: Takahiro Itazuri <[email protected]>

Author: zulinx86

tests/integration_tests/functional/test_cpu_template_helper.py

@@ -133,6 +133,10 @@ def build_cpu_config_dict(cpu_config_path):
     # support it, the userspace cpuid command in ubuntu 22 reports not only
     # the subleaf 0 but also the subleaf 1.
     (0x1B, 0x1),
+    # CPUID.1Fh is a preferred superset to CPUID.0Bh. For the same reason as
+    # CPUID.Bh, the subleaf 2 should be skipped when the guest userspace cpuid
+    # enumerates it.
+    (0x1F, 0x2),
     # CPUID.20000000h is not documented in Intel SDM and AMD APM. KVM doesn't
     # report it, but the userspace cpuid command in ubuntu 22 does.
     (0x20000000, 0x0),