From nobody Fri May 3 06:14:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1507642489080716.3403849284281; Tue, 10 Oct 2017 06:34:49 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BB102267C8; Tue, 10 Oct 2017 13:34:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 79F156C418; Tue, 10 Oct 2017 13:34:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3657318355E1; Tue, 10 Oct 2017 13:34:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9ADFIaP008802 for ; Tue, 10 Oct 2017 09:15:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 720A06955D; Tue, 10 Oct 2017 13:15:18 +0000 (UTC) Received: from mamuti.net (ovpn-204-124.brq.redhat.com [10.40.204.124]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B02F6955B for ; Tue, 10 Oct 2017 13:15:02 +0000 (UTC) Received: by mamuti.net (Postfix, from userid 500) id DE0BD100450; Tue, 10 Oct 2017 15:15:00 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BB102267C8 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Jiri Denemark To: libvir-list@redhat.com Date: Tue, 10 Oct 2017 15:14:57 +0200 Message-Id: <46e167509e87cafd9c44c816b77e6ae61401870e.1507640876.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] qemu: Parse CPU stepping from query-cpu-model-expansion X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 10 Oct 2017 13:34:48 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Even though only family and model are used for matching CPUID data with CPU models from cpu_map.xml, stepping is used by x86DataFilterTSX which is supposed to disable TSX on CPU models with broken TSX support. Thus we need to start parsing stepping from QEMU to make sure we don't disable TSX on CPUs which provide working TSX implementation. See the following patch for a real world example of such CPU. Signed-off-by: Jiri Denemark Reviewed-by: John Ferlan --- src/cpu/cpu_x86.c | 16 +++++++++------- src/cpu/cpu_x86.h | 3 ++- src/qemu/qemu_capabilities.c | 5 ++++- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 0dbc17f199..1e82fbd943 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -531,7 +531,8 @@ virCPUx86VendorToCPUID(const char *vendor, =20 static uint32_t x86MakeSignature(unsigned int family, - unsigned int model) + unsigned int model, + unsigned int stepping) { uint32_t sig =3D 0; =20 @@ -551,6 +552,7 @@ x86MakeSignature(unsigned int family, * * family =3D eax[27:20] + eax[11:8] * model =3D eax[19:16] << 4 + eax[7:4] + * stepping =3D eax[3:0] */ =20 /* extFam */ @@ -570,9 +572,8 @@ x86MakeSignature(unsigned int family, /* Mod */ sig |=3D (model & 0xf) << 4; =20 - /* Step is irrelevant, it is used to distinguish different revisions - * of the same CPU model - */ + /* Step */ + sig |=3D stepping & 0xf; =20 return sig; } @@ -1248,7 +1249,7 @@ x86ModelParse(xmlXPathContextPtr ctxt, goto cleanup; } =20 - model->signature =3D x86MakeSignature(sigFamily, sigModel); + model->signature =3D x86MakeSignature(sigFamily, sigModel, 0); } =20 if (virXPathBoolean("boolean(./vendor)", ctxt)) { @@ -2970,9 +2971,10 @@ virCPUx86DataAddCPUID(virCPUDataPtr cpuData, int virCPUx86DataSetSignature(virCPUDataPtr cpuData, unsigned int family, - unsigned int model) + unsigned int model, + unsigned int stepping) { - uint32_t signature =3D x86MakeSignature(family, model); + uint32_t signature =3D x86MakeSignature(family, model, stepping); =20 return x86DataAddSignature(&cpuData->data.x86, signature); } diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h index 91ec43fea9..5d14d83e1b 100644 --- a/src/cpu/cpu_x86.h +++ b/src/cpu/cpu_x86.h @@ -34,7 +34,8 @@ int virCPUx86DataAddCPUID(virCPUDataPtr cpuData, =20 int virCPUx86DataSetSignature(virCPUDataPtr cpuData, unsigned int family, - unsigned int model); + unsigned int model, + unsigned int stepping); =20 int virCPUx86DataSetVendor(virCPUDataPtr cpuData, const char *vendor); diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 63fb4f34e7..8e802ca44e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3355,6 +3355,7 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps, virCPUDataPtr data =3D NULL; unsigned long long sigFamily =3D 0; unsigned long long sigModel =3D 0; + unsigned long long sigStepping =3D 0; int ret =3D -1; size_t i; =20 @@ -3389,6 +3390,8 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps, sigFamily =3D prop->value.number; else if (STREQ(prop->name, "model")) sigModel =3D prop->value.number; + else if (STREQ(prop->name, "stepping")) + sigStepping =3D prop->value.number; break; =20 case QEMU_MONITOR_CPU_PROPERTY_LAST: @@ -3396,7 +3399,7 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps, } } =20 - if (virCPUx86DataSetSignature(data, sigFamily, sigModel) < 0) + if (virCPUx86DataSetSignature(data, sigFamily, sigModel, sigStepping) = < 0) goto cleanup; =20 if (cpuDecode(cpu, data, virQEMUCapsGetCPUDefinitions(qemuCaps, type))= < 0) --=20 2.14.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 06:14:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 150764294741047.607909728647996; Tue, 10 Oct 2017 06:42:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D27F34C1; Tue, 10 Oct 2017 13:42:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ED8726BC32; Tue, 10 Oct 2017 13:42:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8F40318355DB; Tue, 10 Oct 2017 13:42:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9ADF6OY008768 for ; Tue, 10 Oct 2017 09:15:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id B40BE6247F; Tue, 10 Oct 2017 13:15:06 +0000 (UTC) Received: from mamuti.net (ovpn-204-124.brq.redhat.com [10.40.204.124]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 34B47627D9 for ; Tue, 10 Oct 2017 13:15:02 +0000 (UTC) Received: by mamuti.net (Postfix, from userid 500) id E15B4101840; Tue, 10 Oct 2017 15:15:00 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1D27F34C1 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Jiri Denemark To: libvir-list@redhat.com Date: Tue, 10 Oct 2017 15:14:58 +0200 Message-Id: <6669b60132796e18c407cd451bd42d5ef7ddf635.1507640876.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] cputest: Update Xeon-E7-8890 data X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 10 Oct 2017 13:42:26 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Without the fix in the previous patch the JSON data from QEMU would be interpreted as Haswell-noTSX because x86DataFilterTSX would filter rtm and hle features as a result of family =3D=3D 6 && model =3D=3D 63 && stepping < 4 test even though this CPU has stepping =3D=3D 4. Signed-off-by: Jiri Denemark Reviewed-by: John Ferlan --- tests/cputest.c | 2 +- .../x86_64-cpuid-Xeon-E7-8890-disabled.xml | 6 + .../x86_64-cpuid-Xeon-E7-8890-enabled.xml | 9 + .../cputestdata/x86_64-cpuid-Xeon-E7-8890-json.xml | 14 ++ tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.json | 235 +++++++++++++++++= ++++ tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.xml | 6 +- 6 files changed, 268 insertions(+), 4 deletions(-) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.json diff --git a/tests/cputest.c b/tests/cputest.c index 6b48956c4d..ff54182696 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -1150,7 +1150,7 @@ mymain(void) DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4820", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4830", JSON_MODELS); - DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-8890", JSON_NONE); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-8890", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-6148", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-W3520", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-X5460", JSON_NONE); diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-disabled.xml b/tes= ts/cputestdata/x86_64-cpuid-Xeon-E7-8890-disabled.xml new file mode 100644 index 0000000000..aacc7a2b14 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-disabled.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-enabled.xml b/test= s/cputestdata/x86_64-cpuid-Xeon-E7-8890-enabled.xml new file mode 100644 index 0000000000..026a049f77 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-enabled.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-json.xml b/tests/c= putestdata/x86_64-cpuid-Xeon-E7-8890-json.xml new file mode 100644 index 0000000000..e542456c8b --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-json.xml @@ -0,0 +1,14 @@ + + Haswell + Intel + + + + + + + + + + + diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.json b/tests/cpute= stdata/x86_64-cpuid-Xeon-E7-8890.json new file mode 100644 index 0000000000..d227a7af61 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.json @@ -0,0 +1,235 @@ +{ + "return": { + "model": { + "name": "base", + "props": { + "pfthreshold": false, + "pku": false, + "rtm": true, + "tsc_adjust": true, + "tsc-deadline": true, + "xstore-en": false, + "cpuid-0xb": true, + "abm": true, + "ia64": false, + "kvm-mmu": false, + "xsaveopt": true, + "hv-spinlocks": -1, + "tce": false, + "realized": false, + "kvm_steal_time": true, + "smep": true, + "fpu": true, + "xcrypt": false, + "sse4_2": true, + "clflush": true, + "sse4_1": true, + "flushbyasid": false, + "kvm-steal-time": true, + "lm": true, + "tsc": true, + "adx": false, + "fxsr": true, + "sha-ni": false, + "decodeassists": false, + "hv-relaxed": false, + "pclmuldq": true, + "xgetbv1": false, + "xstore": false, + "vmcb_clean": false, + "tsc-adjust": true, + "vme": true, + "vendor": "GenuineIntel", + "arat": true, + "ffxsr": false, + "de": true, + "aes": true, + "pse": true, + "ds-cpl": false, + "fxsr_opt": false, + "tbm": false, + "sse": true, + "phe-en": false, + "f16c": true, + "ds": false, + "mpx": false, + "vmware-cpuid-freq": true, + "avx512f": false, + "avx2": true, + "level": 13, + "pbe": false, + "cx16": true, + "ds_cpl": false, + "movbe": true, + "perfctr-nb": false, + "nrip_save": false, + "kvm_mmu": false, + "ospke": false, + "pmu": false, + "avx512ifma": false, + "stepping": 4, + "sep": true, + "sse4a": false, + "avx512dq": false, + "core-id": -1, + "i64": true, + "avx512-4vnniw": false, + "xsave": true, + "pmm": false, + "hle": true, + "nodeid_msr": false, + "hv-crash": false, + "est": false, + "osxsave": false, + "xop": false, + "smx": false, + "tsc-scale": false, + "monitor": false, + "avx512er": false, + "apic": true, + "sse4.1": true, + "sse4.2": true, + "hv-vapic": false, + "pause-filter": false, + "lahf-lm": true, + "kvm-nopiodelay": true, + "cmp_legacy": false, + "acpi": false, + "fma4": false, + "mmx": true, + "svm_lock": false, + "pcommit": false, + "mtrr": true, + "clwb": false, + "dca": false, + "pdcm": false, + "xcrypt-en": false, + "3dnow": false, + "invtsc": false, + "tm2": false, + "hv-time": false, + "hypervisor": true, + "kvmclock-stable-bit": true, + "xlevel": 2147483656, + "lahf_lm": true, + "enforce": false, + "pcid": true, + "sse4-1": true, + "lbrv": false, + "avx512-vpopcntdq": false, + "avx512-4fmaps": false, + "fill-mtrr-mask": true, + "pause_filter": false, + "svm-lock": false, + "popcnt": true, + "nrip-save": false, + "avx512vl": false, + "x2apic": true, + "kvmclock": true, + "smap": false, + "pdpe1gb": true, + "family": 6, + "min-level": 13, + "xlevel2": 0, + "dtes64": false, + "xd": true, + "kvm_pv_eoi": true, + "ace2": false, + "kvm_pv_unhalt": true, + "xtpr": false, + "perfctr_nb": false, + "avx512bw": false, + "l3-cache": true, + "nx": true, + "lwp": false, + "msr": true, + "syscall": true, + "tm": false, + "perfctr-core": false, + "memory": "/machine/unattached/system[0]", + "pge": true, + "pn": false, + "fma": true, + "nodeid-msr": false, + "xsavec": false, + "socket-id": -1, + "thread-id": -1, + "cx8": true, + "mce": true, + "avx512cd": false, + "cr8legacy": false, + "mca": true, + "avx512pf": false, + "pni": true, + "hv-vendor-id": "", + "rdseed": false, + "osvw": false, + "fsgsbase": true, + "model-id": "Intel(R) Xeon(R) CPU E7-8890 v3 @ 2.50GHz", + "cmp-legacy": false, + "kvm-pv-unhalt": true, + "rdtscp": true, + "mmxext": false, + "host-phys-bits": true, + "cid": false, + "vmx": false, + "ssse3": true, + "extapic": false, + "pse36": true, + "min-xlevel": 2147483656, + "ibs": false, + "la57": false, + "avx": true, + "kvm-no-smi-migration": false, + "ace2-en": false, + "umip": false, + "invpcid": true, + "bmi1": true, + "bmi2": true, + "vmcb-clean": false, + "erms": true, + "cmov": true, + "check": true, + "perfctr_core": false, + "misalignsse": false, + "clflushopt": false, + "pat": true, + "sse4-2": true, + "3dnowprefetch": false, + "rdpid": false, + "full-cpuid-auto-level": true, + "pae": true, + "wdt": false, + "tsc_scale": false, + "skinit": false, + "fxsr-opt": false, + "kvm_nopiodelay": true, + "phys-bits": 0, + "kvm": true, + "pmm-en": false, + "phe": false, + "3dnowext": false, + "lmce": false, + "ht": false, + "tsc-frequency": 0, + "kvm-pv-eoi": true, + "npt": false, + "apic-id": 4294967295, + "kvm_asyncpf": true, + "min-xlevel2": 0, + "pclmulqdq": true, + "svm": false, + "sse3": true, + "sse2": true, + "ss": true, + "topoext": false, + "rdrand": true, + "avx512vbmi": false, + "kvm-asyncpf": true, + "xsaves": false, + "model": 63 + } + } + }, + "id": "model-expansion" +} diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.xml b/tests/cputes= tdata/x86_64-cpuid-Xeon-E7-8890.xml index ccdb792193..c249e6ba4a 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.xml @@ -1,7 +1,7 @@ - + @@ -14,8 +14,8 @@ - - + + --=20 2.14.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 06:14:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1507642923308706.622977578854; Tue, 10 Oct 2017 06:42:03 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0A3C481E0F; Tue, 10 Oct 2017 13:42:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A9D206871D; Tue, 10 Oct 2017 13:42:01 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8223C18355DA; Tue, 10 Oct 2017 13:42:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9ADF6IM008763 for ; Tue, 10 Oct 2017 09:15:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8D79B62943; Tue, 10 Oct 2017 13:15:06 +0000 (UTC) Received: from mamuti.net (ovpn-204-124.brq.redhat.com [10.40.204.124]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36F656293F for ; Tue, 10 Oct 2017 13:15:02 +0000 (UTC) Received: by mamuti.net (Postfix, from userid 500) id E39B1101841; Tue, 10 Oct 2017 15:15:00 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0A3C481E0F Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Jiri Denemark To: libvir-list@redhat.com Date: Tue, 10 Oct 2017 15:14:59 +0200 Message-Id: <065c3a0479aa05be8e8946cec42c3c425755fbf0.1507640876.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] cputest: Add query-cpu-definitions reply for Xeon-E7-8890 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 10 Oct 2017 13:42:02 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark Reviewed-by: John Ferlan --- tests/cputest.c | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.json | 286 +++++++++++++++++++= ++++ 2 files changed, 287 insertions(+), 1 deletion(-) diff --git a/tests/cputest.c b/tests/cputest.c index ff54182696..2aedc9043c 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -1150,7 +1150,7 @@ mymain(void) DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4820", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4830", JSON_MODELS); - DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-8890", JSON_HOST); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-8890", JSON_MODELS); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-6148", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-W3520", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-X5460", JSON_NONE); diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.json b/tests/cpute= stdata/x86_64-cpuid-Xeon-E7-8890.json index d227a7af61..4b6a9109a9 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.json +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.json @@ -233,3 +233,289 @@ }, "id": "model-expansion" } + +{ + "return": [ + { + "typename": "max-x86_64-cpu", + "unavailable-features": [], + "migration-safe": false, + "static": false, + "name": "max" + }, + { + "typename": "host-x86_64-cpu", + "unavailable-features": [], + "migration-safe": false, + "static": false, + "name": "host" + }, + { + "typename": "base-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": true, + "name": "base" + }, + { + "typename": "qemu64-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "qemu64" + }, + { + "typename": "qemu32-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "qemu32" + }, + { + "typename": "phenom-x86_64-cpu", + "unavailable-features": [ + "mmxext", + "fxsr-opt", + "3dnowext", + "3dnow", + "sse4a", + "npt" + ], + "migration-safe": true, + "static": false, + "name": "phenom" + }, + { + "typename": "pentium3-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "pentium3" + }, + { + "typename": "pentium2-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "pentium2" + }, + { + "typename": "pentium-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "pentium" + }, + { + "typename": "n270-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "n270" + }, + { + "typename": "kvm64-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "kvm64" + }, + { + "typename": "kvm32-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "kvm32" + }, + { + "typename": "cpu64-rhel6-x86_64-cpu", + "unavailable-features": [ + "sse4a" + ], + "migration-safe": true, + "static": false, + "name": "cpu64-rhel6" + }, + { + "typename": "coreduo-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "coreduo" + }, + { + "typename": "core2duo-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "core2duo" + }, + { + "typename": "athlon-x86_64-cpu", + "unavailable-features": [ + "mmxext", + "3dnowext", + "3dnow" + ], + "migration-safe": true, + "static": false, + "name": "athlon" + }, + { + "typename": "Westmere-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Westmere" + }, + { + "typename": "Skylake-Client-x86_64-cpu", + "unavailable-features": [ + "mpx", + "rdseed", + "adx", + "smap", + "3dnowprefetch", + "xsavec", + "xgetbv1", + "mpx", + "mpx" + ], + "migration-safe": true, + "static": false, + "name": "Skylake-Client" + }, + { + "typename": "SandyBridge-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "SandyBridge" + }, + { + "typename": "Penryn-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Penryn" + }, + { + "typename": "Opteron_G5-x86_64-cpu", + "unavailable-features": [ + "sse4a", + "misalignsse", + "3dnowprefetch", + "xop", + "fma4", + "tbm" + ], + "migration-safe": true, + "static": false, + "name": "Opteron_G5" + }, + { + "typename": "Opteron_G4-x86_64-cpu", + "unavailable-features": [ + "sse4a", + "misalignsse", + "3dnowprefetch", + "xop", + "fma4" + ], + "migration-safe": true, + "static": false, + "name": "Opteron_G4" + }, + { + "typename": "Opteron_G3-x86_64-cpu", + "unavailable-features": [ + "sse4a", + "misalignsse" + ], + "migration-safe": true, + "static": false, + "name": "Opteron_G3" + }, + { + "typename": "Opteron_G2-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Opteron_G2" + }, + { + "typename": "Opteron_G1-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Opteron_G1" + }, + { + "typename": "Nehalem-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Nehalem" + }, + { + "typename": "IvyBridge-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "IvyBridge" + }, + { + "typename": "Haswell-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Haswell" + }, + { + "typename": "Haswell-noTSX-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Haswell-noTSX" + }, + { + "typename": "Conroe-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "Conroe" + }, + { + "typename": "Broadwell-x86_64-cpu", + "unavailable-features": [ + "rdseed", + "adx", + "smap", + "3dnowprefetch" + ], + "migration-safe": true, + "static": false, + "name": "Broadwell" + }, + { + "typename": "Broadwell-noTSX-x86_64-cpu", + "unavailable-features": [ + "rdseed", + "adx", + "smap", + "3dnowprefetch" + ], + "migration-safe": true, + "static": false, + "name": "Broadwell-noTSX" + }, + { + "typename": "486-x86_64-cpu", + "unavailable-features": [], + "migration-safe": true, + "static": false, + "name": "486" + } + ], + "id": "definitions" +} --=20 2.14.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list