From 597dd548f0d5a5ddf662ad748f1b1a9f0a456dce Mon Sep 17 00:00:00 2001

Message-Id: <597dd548f0d5a5ddf662ad748f1b1a9f0a456dce@dist-git>

From: Jiri Denemark <jdenemar@redhat.com>

Date: Fri, 21 Jun 2019 09:25:53 +0200

Subject: [PATCH] qemu: Probe for "unavailable-features" CPU property

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

It is similar to "filtered-features" property, which reports CPUID bits

corresponding to disabled features, but more general. The

"unavailable-features" property supports both CPUID and MSR features by

listing their names.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

(cherry picked from commit 0d254bce4ec6fd62c0277d24e28bf018a4c6cb37)

https://bugzilla.redhat.com/show_bug.cgi?id=1697627

Conflicts:

	src/qemu/qemu_capabilities.c

            - several capabilities check are missing

	tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies

	tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies

	tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies

            - QMP message IDs are different

	tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies

	tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies

            - missing

	tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml

	tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml

	tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml

            - file size based microcode version

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

Message-Id: <2cf5c234b2b3e54250f0d8b1e12763d4f8e81247.1561068591.git.jdenemar@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 src/qemu/qemu_capabilities.c                  |    8 +

 src/qemu/qemu_capabilities.h                  |    1 +

 .../caps_2.12.0.x86_64.replies                | 1078 ++++++++++++++-

 .../caps_2.12.0.x86_64.xml                    |    2 +-

 .../caps_3.0.0.x86_64.replies                 | 1116 +++++++++++++++-

 .../caps_3.0.0.x86_64.xml                     |    2 +-

 .../caps_4.1.0.x86_64.replies                 | 1188 ++++++++++++++++-

 .../caps_4.1.0.x86_64.xml                     |    3 +-

 8 files changed, 3317 insertions(+), 81 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c

index 4515da4b91..beec9d1497 100644

--- a/src/qemu/qemu_capabilities.c

+++ b/src/qemu/qemu_capabilities.c

@@ -515,6 +515,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,

               "zpci",

               "machine.pseries.cap-nested-hv",

               "x86-max-cpu",

+              "cpu-unavailable-features",

     );

@@ -1452,6 +1453,10 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsSPAPRMachine[] = {

     { "cap-nested-hv", QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV },

 };

+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMaxX86CPU[] = {

+    { "unavailable-features", QEMU_CAPS_CPU_UNAVAILABLE_FEATURES },

+};

+

 static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {

     { "memory-backend-file", virQEMUCapsObjectPropsMemoryBackendFile,

       ARRAY_CARDINALITY(virQEMUCapsObjectPropsMemoryBackendFile),

@@ -1459,6 +1464,9 @@ static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {

     { "spapr-machine", virQEMUCapsObjectPropsSPAPRMachine,

       ARRAY_CARDINALITY(virQEMUCapsObjectPropsSPAPRMachine),

       -1 },

+    { "max-x86_64-cpu", virQEMUCapsObjectPropsMaxX86CPU,

+      ARRAY_CARDINALITY(virQEMUCapsObjectPropsMaxX86CPU),

+      QEMU_CAPS_X86_MAX_CPU },

 };

 static void

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h

index 25ed5064b9..5aa41efdb0 100644

--- a/src/qemu/qemu_capabilities.h

+++ b/src/qemu/qemu_capabilities.h

@@ -495,6 +495,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */

     QEMU_CAPS_DEVICE_ZPCI, /* -device zpci */

     QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-nested-hv */

     QEMU_CAPS_X86_MAX_CPU, /* max-x86_64-cpu type exists */

+    QEMU_CAPS_CPU_UNAVAILABLE_FEATURES, /* "unavailable-features" CPU property */

     QEMU_CAPS_LAST /* this must always be the last item */

 } virQEMUCapsFlags;

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies

index 6f37e4301e..66a5577e5e 100644

--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies

+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies

@@ -5011,10 +5011,1040 @@

 }

 {

-  "execute": "query-machines",

+  "execute": "qom-list-properties",

+  "arguments": {

+    "typename": "max-x86_64-cpu"

+  },

   "id": "libvirt-43"

 }

+{

+  "return": [

+    {

+      "name": "min-xlevel2",

+      "type": "uint32"

+    },

+    {

+      "name": "vendor",

+      "type": "string"

+    },

+    {

+      "name": "gfni",

+      "type": "bool"

+    },

+    {

+      "name": "clwb",

+      "type": "bool"

+    },

+    {

+      "name": "nx",

+      "type": "bool"

+    },

+    {

+      "name": "x2apic",

+      "type": "bool"

+    },

+    {

+      "name": "kvmclock-stable-bit",

+      "type": "bool"

+    },

+    {

+      "name": "vmcb_clean",

+      "type": "bool"

+    },

+    {

+      "name": "min-level",

+      "type": "uint32"

+    },

+    {

+      "name": "fxsr-opt",

+      "type": "bool"

+    },

+    {

+      "name": "skinit",

+      "type": "bool"

+    },

+    {

+      "name": "avx",

+      "type": "bool"

+    },

+    {

+      "name": "3dnowext",

+      "type": "bool"

+    },

+    {

+      "name": "hv-crash",

+      "type": "bool"

+    },

+    {

+      "name": "nodeid_msr",

+      "type": "bool"

+    },

+    {

+      "name": "hypervisor",

+      "type": "bool"

+    },

+    {

+      "name": "enforce",

+      "type": "bool"

+    },

+    {

+      "name": "stepping",

+      "type": "int"

+    },

+    {

+      "name": "sse4_2",

+      "type": "bool"

+    },

+    {

+      "name": "sse4_1",

+      "type": "bool"

+    },

+    {

+      "name": "x-hv-max-vps",

+      "type": "int32"

+    },

+    {

+      "name": "hv-frequencies",

+      "type": "bool"

+    },

+    {

+      "name": "kvm-hint-dedicated",

+      "type": "bool"

+    },

+    {

+      "name": "cmp_legacy",

+      "type": "bool"

+    },

+    {

+      "name": "tm2",

+      "type": "bool"

+    },

+    {

+      "name": "smx",

+      "type": "bool"

+    },

+    {

+      "name": "host-cache-info",

+      "type": "bool"

+    },

+    {

+      "name": "hv-vendor-id",

+      "type": "str"

+    },

+    {

+      "name": "movbe",

+      "type": "bool"

+    },

+    {

+      "name": "3dnowprefetch",

+      "type": "bool"

+    },

+    {

+      "name": "mtrr",

+      "type": "bool"

+    },

+    {

+      "name": "wdt",

+      "type": "bool"

+    },

+    {

+      "name": "thread-id",

+      "type": "int32"

+    },

+    {

+      "name": "aes",

+      "type": "bool"

+    },

+    {

+      "name": "apic-id",

+      "type": "uint32"

+    },

+    {

+      "name": "lm",

+      "type": "bool"

+    },

+    {

+      "name": "family",

+      "type": "int"

+    },

+    {

+      "name": "tsc-adjust",

+      "type": "bool"

+    },

+    {

+      "name": "pfthreshold",

+      "type": "bool"

+    },

+    {

+      "name": "ospke",

+      "type": "bool"

+    },

+    {

+      "name": "kvm-no-smi-migration",

+      "type": "bool"

+    },

+    {

+      "name": "pse",

+      "type": "bool"

+    },

+    {

+      "name": "filtered-features",

+      "type": "X86CPUFeatureWordInfo"

+    },

+    {

+      "name": "hv-vpindex",

+      "type": "bool"

+    },

+    {

+      "name": "adx",

+      "type": "bool"

+    },

+    {

+      "name": "avx512bitalg",

+      "type": "bool"

+    },

+    {

+      "name": "i64",

+      "type": "bool"

+    },

+    {

+      "name": "vaes",

+      "type": "bool"

+    },

+    {

+      "name": "ia64",

+      "type": "bool"

+    },

+    {

+      "name": "nodeid-msr",

+      "type": "bool"

+    },

+    {

+      "name": "ibpb",

+      "type": "bool"

+    },

+    {

+      "name": "hv-synic",

+      "type": "bool"

+    },

+    {

+      "name": "ibs",

+      "type": "bool"

+    },

+    {

+      "name": "kvm_mmu",

+      "type": "bool"

+    },

+    {

+      "name": "tcg-cpuid",

+      "type": "bool"

+    },

+    {

+      "name": "nrip_save",

+      "type": "bool"

+    },

+    {

+      "name": "kvm_nopiodelay",

+      "type": "bool"

+    },

+    {

+      "name": "lbrv",

+      "type": "bool"

+    },

+    {

+      "name": "rdtscp",

+      "type": "bool"

+    },

+    {

+      "name": "memory",

+      "type": "link<qemu:memory-region>"

+    },

+    {

+      "name": "avx512vbmi2",

+      "type": "bool"

+    },

+    {

+      "name": "ace2-en",

+      "type": "bool"

+    },

+    {

+      "name": "invtsc",

+      "type": "bool"

+    },

+    {

+      "name": "sse4.2",

+      "type": "bool"

+    },

+    {

+      "name": "sse4.1",

+      "type": "bool"

+    },

+    {

+      "name": "pbe",

+      "type": "bool"

+    },

+    {

+      "name": "rdrand",

+      "type": "bool"

+    },

+    {

+      "name": "socket-id",

+      "type": "int32"

+    },

+    {

+      "name": "hotpluggable",

+      "type": "bool"

+    },

+    {

+      "name": "kvm-steal-time",

+      "type": "bool"

+    },

+    {

+      "name": "l3-cache",

+      "type": "bool"

+    },

+    {

+      "name": "vmware-cpuid-freq",

+      "type": "bool"

+    },

+    {

+      "name": "xop",

+      "type": "bool"

+    },

+    {

+      "name": "tsc-frequency",

+      "type": "int"

+    },

+    {

+      "name": "fill-mtrr-mask",

+      "type": "bool"

+    },

+    {

+      "name": "core-id",

+      "type": "int32"

+    },

+    {

+      "name": "intel-pt",

+      "type": "bool"

+    },

+    {

+      "name": "pat",

+      "type": "bool"

+    },

+    {

+      "name": "pcid",

+      "type": "bool"

+    },

+    {

+      "name": "pclmulqdq",

+      "type": "bool"

+    },

+    {

+      "name": "sse4-2",

+      "type": "bool"

+    },

+    {

+      "name": "sse4-1",

+      "type": "bool"

+    },

+    {

+      "name": "sha-ni",

+      "type": "bool"

+    },

+    {

+      "name": "cmov",

+      "type": "bool"

+    },

+    {

+      "name": "pae",

+      "type": "bool"

+    },

+    {

+      "name": "smep",

+      "type": "bool"

+    },

+    {

+      "name": "abm",

+      "type": "bool"

+    },

+    {

+      "name": "xstore",

+      "type": "bool"

+    },

+    {

+      "name": "tsc_adjust",

+      "type": "bool"

+    },

+    {

+      "name": "type",

+      "type": "string"

+    },

+    {

+      "name": "kvm-asyncpf",

+      "type": "bool"

+    },

+    {

+      "name": "min-xlevel",

+      "type": "uint32"

+    },

+    {

+      "name": "pdpe1gb",

+      "type": "bool"

+    },

+    {

+      "name": "kvm-mmu",

+      "type": "bool"

+    },

+    {

+      "name": "kvm-pv-unhalt",

+      "type": "bool"

+    },

+    {

+      "name": "avx512f",

+      "type": "bool"

+    },

+    {

+      "name": "avx512vbmi",

+      "type": "bool"

+    },

+    {

+      "name": "avx512-4vnniw",

+      "type": "bool"

+    },

+    {

+      "name": "xd",

+      "type": "bool"

+    },

+    {

+      "name": "mmxext",

+      "type": "bool"

+    },

+    {

+      "name": "decodeassists",

+      "type": "bool"

+    },

+    {

+      "name": "ht",

+      "type": "bool"

+    },

+    {

+      "name": "xsave",

+      "type": "bool"

+    },

+    {

+      "name": "perfctr_core",

+      "type": "bool"

+    },

+    {

+      "name": "feature-words",

+      "type": "X86CPUFeatureWordInfo"

+    },

+    {

+      "name": "migratable",

+      "type": "bool"

+    },

+    {

+      "name": "3dnow",

+      "type": "bool"

+    },

+    {

+      "name": "spec-ctrl",

+      "type": "bool"

+    },

+    {

+      "name": "model",

+      "type": "int"

+    },

+    {

+      "name": "nrip-save",

+      "type": "bool"

+    },

+    {

+      "name": "lwp",

+      "type": "bool"

+    },

+    {

+      "name": "xstore-en",

+      "type": "bool"

+    },

+    {

+      "name": "avx512vl",

+      "type": "bool"

+    },

+    {

+      "name": "kvm_pv_unhalt",

+      "type": "bool"

+    },

+    {

+      "name": "bmi2",

+      "type": "bool"

+    },

+    {

+      "name": "bmi1",

+      "type": "bool"

+    },

+    {

+      "name": "la57",

+      "type": "bool"

+    },

+    {

+      "name": "ffxsr",

+      "type": "bool"

+    },

+    {

+      "name": "vmcb-clean",

+      "type": "bool"

+    },

+    {

+      "name": "pause-filter",

+      "type": "bool"

+    },

+    {

+      "name": "pni",

+      "type": "bool"

+    },

+    {

+      "name": "kvm_steal_time",

+      "type": "bool"

+    },

+    {

+      "name": "svm_lock",

+      "type": "bool"

+    },

+    {

+      "name": "pse36",

+      "type": "bool"

+    },

+    {

+      "name": "hv-stimer",

+      "type": "bool"

+    },

+    {

+      "name": "host-phys-bits",

+      "type": "bool"

+    },

+    {

+      "name": "extapic",

+      "type": "bool"

+    },

+    {

+      "name": "hv-spinlocks",

+      "type": "int"

+    },

+    {

+      "name": "pmu",

+      "type": "bool"

+    },

+    {

+      "name": "pmm",

+      "type": "bool"

+    },

+    {

+      "name": "vpclmulqdq",

+      "type": "bool"

+    },

+    {

+      "name": "avx512-vpopcntdq",

+      "type": "bool"

+    },

+    {

+      "name": "avx512er",

+      "type": "bool"

+    },

+    {

+      "name": "pdcm",

+      "type": "bool"

+    },

+    {

+      "name": "svm",

+      "type": "bool"

+    },

+    {

+      "name": "apic",

+      "type": "bool"

+    },

+    {

+      "name": "xcrypt-en",

+      "type": "bool"

+    },

+    {

+      "name": "cr8legacy",

+      "type": "bool"

+    },

+    {

+      "name": "fma4",

+      "type": "bool"

+    },

+    {

+      "name": "erms",

+      "type": "bool"

+    },

+    {

+      "name": "msr",

+      "type": "bool"

+    },

+    {

+      "name": "ds_cpl",

+      "type": "bool"

+    },

+    {

+      "name": "xlevel",

+      "type": "uint32"

+    },

+    {

+      "name": "hotplugged",

+      "type": "bool"

+    },

+    {

+      "name": "hv-relaxed",

+      "type": "bool"

+    },

+    {

+      "name": "perfctr-core",

+      "type": "bool"

+    },

+    {

+      "name": "sep",

+      "type": "bool"

+    },

+    {

+      "name": "smap",

+      "type": "bool"

+    },

+    {

+      "name": "sse3",

+      "type": "bool"

+    },

+    {

+      "name": "avx512dq",

+      "type": "bool"

+    },

+    {

+      "name": "ssse3",

+      "type": "bool"

+    },

+    {

+      "name": "pmm-en",

+      "type": "bool"

+    },

+    {

+      "name": "npt",

+      "type": "bool"

+    },

+    {

+      "name": "kvm-pv-tlb-flush",

+      "type": "bool"

+    },

+    {

+      "name": "tsc",

+      "type": "bool"

+    },

+    {

+      "name": "monitor",

+      "type": "bool"

+    },

+    {

+      "name": "f16c",

+      "type": "bool"

+    },

+    {

+      "name": "sse2",

+      "type": "bool"

+    },

+    {

+      "name": "rdpid",

+      "type": "bool"

+    },

+    {

+      "name": "mce",

+      "type": "bool"

+    },

+    {

+      "name": "full-cpuid-auto-level",

+      "type": "bool"

+    },

+    {

+      "name": "xtpr",

+      "type": "bool"

+    },

+    {

+      "name": "mca",

+      "type": "bool"

+    },

+    {

+      "name": "cid",

+      "type": "bool"

+    },

+    {

+      "name": "tm",

+      "type": "bool"

+    },

+    {

+      "name": "pku",

+      "type": "bool"

+    },

+    {

+      "name": "avx512vnni",

+      "type": "bool"

+    },

+    {

+      "name": "tce",

+      "type": "bool"

+    },

+    {

+      "name": "kvmclock",

+      "type": "bool"

+    },

+    {

+      "name": "sse4a",

+      "type": "bool"

+    },

+    {

+      "name": "ds",

+      "type": "bool"

+    },

+    {

+      "name": "lahf-lm",

+      "type": "bool"

+    },

+    {

+      "name": "xsaves",

+      "type": "bool"

+    },

+    {

+      "name": "clflushopt",

+      "type": "bool"

+    },

+    {

+      "name": "kvm",

+      "type": "bool"

+    },

+    {

+      "name": "ss",

+      "type": "bool"

+    },

+    {

+      "name": "flushbyasid",

+      "type": "bool"

+    },

+    {

+      "name": "pause_filter",

+      "type": "bool"

+    },

+    {

+      "name": "de",

+      "type": "bool"

+    },

+    {

+      "name": "est",

+      "type": "bool"

+    },

+    {

+      "name": "check",

+      "type": "bool"

+    },

+    {

+      "name": "lahf_lm",

+      "type": "bool"

+    },

+    {

+      "name": "dtes64",

+      "type": "bool"

+    },

+    {

+      "name": "vmx",

+      "type": "bool"

+    },

+    {

+      "name": "xsavec",

+      "type": "bool"

+    },

+    {

+      "name": "svm-lock",

+      "type": "bool"

+    },

+    {

+      "name": "avx512ifma",

+      "type": "bool"

+    },

+    {

+      "name": "clflush",

+      "type": "bool"

+    },

+    {

+      "name": "rdseed",

+      "type": "bool"

+    },

+    {

+      "name": "avx512cd",

+      "type": "bool"

+    },

+    {

+      "name": "xsaveopt",

+      "type": "bool"