Having to use cpuBaseline with VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES flag to expand CPU features is strange. Not to mention that cpuBaseline can only expand host CPU definitions (i.e., it completely ignores feature policies). The new virCPUExpandFeatures API is designed to work with both host and guest CPU definitions. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/cpu/cpu.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ src/cpu/cpu.h | 8 ++++++++ src/cpu/cpu_x86.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + 4 files changed, 112 insertions(+) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 1461190ba..5604db1d1 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -1063,3 +1063,53 @@ virCPUConvertLegacy(virArch arch, VIR_DEBUG("model=%s", NULLSTR(cpu->model)); return 0; } + + +static int +virCPUFeatureCompare(const void *p1, + const void *p2) +{ + const virCPUFeatureDef *f1 = p1; + const virCPUFeatureDef *f2 = p2; + + return strcmp(f1->name, f2->name); +} + + +/** + * virCPUExpandFeatures: + * + * @arch: CPU architecture + * @cpu: CPU definition to be expanded + * + * Add all features implicitly enabled by the CPU model to the list of + * features. The @cpu is expected to be either a host or a guest representation + * of a host CPU, i.e., only VIR_CPU_FEATURE_REQUIRE and + * VIR_CPU_FEATURE_DISABLE policies are supported. + * + * The updated list of features in the CPU definition is sorted. + * + * Return -1 on error, 0 on success. + */ +int +virCPUExpandFeatures(virArch arch, + virCPUDefPtr cpu) +{ + struct cpuArchDriver *driver; + + VIR_DEBUG("arch=%s, cpu=%p, model=%s, nfeatures=%zu", + virArchToString(arch), cpu, NULLSTR(cpu->model), cpu->nfeatures); + + if (!(driver = cpuGetSubDriver(arch))) + return -1; + + if (driver->expandFeatures && + driver->expandFeatures(cpu) < 0) + return -1; + + qsort(cpu->features, cpu->nfeatures, sizeof(*cpu->features), + virCPUFeatureCompare); + + VIR_DEBUG("nfeatures=%zu", cpu->nfeatures); + return 0; +} diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 7d6d3e921..5a8728bce 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -116,6 +116,9 @@ typedef int typedef int (*virCPUArchConvertLegacy)(virCPUDefPtr cpu); +typedef int +(*virCPUArchExpandFeatures)(virCPUDefPtr cpu); + struct cpuArchDriver { const char *name; const virArch *arch; @@ -135,6 +138,7 @@ struct cpuArchDriver { virCPUArchGetModels getModels; virCPUArchTranslate translate; virCPUArchConvertLegacy convertLegacy; + virCPUArchExpandFeatures expandFeatures; }; @@ -245,6 +249,10 @@ virCPUConvertLegacy(virArch arch, virCPUDefPtr cpu) ATTRIBUTE_NONNULL(2); +int +virCPUExpandFeatures(virArch arch, + virCPUDefPtr cpu); + /* virCPUDataFormat and virCPUDataParse are implemented for unit tests only and * have no real-life usage */ diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 9e208b094..442f0ce44 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2891,6 +2891,58 @@ virCPUx86Translate(virCPUDefPtr cpu, } +static int +virCPUx86ExpandFeatures(virCPUDefPtr cpu) +{ + virCPUx86MapPtr map; + virCPUDefPtr expanded = NULL; + virCPUx86ModelPtr model = NULL; + bool host = cpu->type == VIR_CPU_TYPE_HOST; + size_t i; + int ret = -1; + + if (!(map = virCPUx86GetMap())) + goto cleanup; + + if (!(expanded = virCPUDefCopy(cpu))) + goto cleanup; + + virCPUDefFreeFeatures(expanded); + + if (!(model = x86ModelFind(map, cpu->model))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown CPU model %s"), cpu->model); + goto cleanup; + } + + if (!(model = x86ModelCopy(model)) || + x86DataToCPUFeatures(expanded, host ? -1 : VIR_CPU_FEATURE_REQUIRE, + &model->data, map) < 0) + goto cleanup; + + for (i = 0; i < cpu->nfeatures; i++) { + virCPUFeatureDefPtr f = cpu->features + i; + + if (!host && + f->policy != VIR_CPU_FEATURE_REQUIRE && + f->policy != VIR_CPU_FEATURE_DISABLE) + continue; + + if (virCPUDefUpdateFeature(expanded, f->name, f->policy) < 0) + goto cleanup; + } + + virCPUDefFreeModel(cpu); + + ret = virCPUDefCopyModel(cpu, expanded, false); + + cleanup: + virCPUDefFree(expanded); + x86ModelFree(model); + return ret; +} + + int virCPUx86DataAddCPUID(virCPUDataPtr cpuData, const virCPUx86CPUID *cpuid) @@ -2965,4 +3017,5 @@ struct cpuArchDriver cpuDriverX86 = { .dataParse = virCPUx86DataParse, .getModels = virCPUx86GetModels, .translate = virCPUx86Translate, + .expandFeatures = virCPUx86ExpandFeatures, }; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7ac5e533f..21912434d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1013,6 +1013,7 @@ virCPUDataFormat; virCPUDataFree; virCPUDataNew; virCPUDataParse; +virCPUExpandFeatures; virCPUGetHost; virCPUGetModels; virCPUTranslate; -- 2.12.0

cpuBaseline is responsible for computing a baseline CPU while feature expansion is done by virCPUExpandFeatures. The cpuBaselineXML wrapper (used by hypervisor drivers to implement virConnectBaselineCPU API) calls cpuBaseline followed by virCPUExpandFeatures if requested by VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES flag. The features in the three changed test files had to be sorted using "sort -k 3" because virCPUExpandFeatures returns a sorted list of features. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/cpu/cpu.c | 8 +++ src/cpu/cpu_x86.c | 33 ----------- tests/cputest.c | 8 +++ tests/cputestdata/x86_64-baseline-3-expanded.xml | 48 ++++++++-------- tests/cputestdata/x86_64-baseline-4-expanded.xml | 68 +++++++++++------------ tests/cputestdata/x86_64-baseline-5-expanded.xml | 70 ++++++++++++------------ 6 files changed, 109 insertions(+), 126 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 33581e5fe..d53a7ef2c 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -498,6 +498,10 @@ cpuBaselineXML(const char **xmlCPUs, size_t i; VIR_DEBUG("ncpus=%u, nmodels=%u", ncpus, nmodels); + + virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES | + VIR_CONNECT_BASELINE_CPU_MIGRATABLE, NULL); + if (xmlCPUs) { for (i = 0; i < ncpus; i++) VIR_DEBUG("xmlCPUs[%zu]=%s", i, NULLSTR(xmlCPUs[i])); @@ -538,6 +542,10 @@ cpuBaselineXML(const char **xmlCPUs, if (!(cpu = cpuBaseline(cpus, ncpus, models, nmodels, flags))) goto error; + if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) && + virCPUExpandFeatures(cpus[0]->arch, cpu) < 0) + goto error; + cpustr = virCPUDefFormat(cpu, NULL, false); cleanup: diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 9c480398f..388102f35 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -967,28 +967,6 @@ x86FeaturesLoad(virCPUx86MapPtr map, return 0; } -static int -x86DataFromCPUFeatures(virCPUx86Data *data, - virCPUDefPtr cpu, - virCPUx86MapPtr map) -{ - size_t i; - - for (i = 0; i < cpu->nfeatures; i++) { - virCPUx86FeaturePtr feature; - if (!(feature = x86FeatureFind(map, cpu->features[i].name))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown CPU feature %s"), cpu->features[i].name); - return -1; - } - - if (x86DataAdd(data, &feature->data) < 0) - return -1; - } - - return 0; -} - static virCPUx86ModelPtr x86ModelNew(void) @@ -1948,17 +1926,6 @@ x86Decode(virCPUDefPtr cpu, } } - if (flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) { - if (x86DataCopy(&copy, &model->data) < 0 || - x86DataFromCPUFeatures(&features, cpuModel, map) < 0) - goto cleanup; - - x86DataSubtract(&copy, &features); - if (x86DataToCPUFeatures(cpuModel, VIR_CPU_FEATURE_REQUIRE, - &copy, map) < 0) - goto cleanup; - } - if (vendor && VIR_STRDUP(cpu->vendor, vendor->name) < 0) goto cleanup; diff --git a/tests/cputest.c b/tests/cputest.c index 5e205c501..6396e8670 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -325,6 +325,14 @@ cpuTestBaseline(const void *arg) goto cleanup; baseline = cpuBaseline(cpus, ncpus, NULL, 0, data->flags); + + if (baseline && + (data->flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) && + virCPUExpandFeatures(data->arch, baseline) < 0) { + virCPUDefFree(baseline); + baseline = NULL; + } + if (data->result < 0) { virResetLastError(); if (!baseline) { diff --git a/tests/cputestdata/x86_64-baseline-3-expanded.xml b/tests/cputestdata/x86_64-baseline-3-expanded.xml index f0c2273d8..82857e3d4 100644 --- a/tests/cputestdata/x86_64-baseline-3-expanded.xml +++ b/tests/cputestdata/x86_64-baseline-3-expanded.xml @@ -1,35 +1,35 @@ <cpu mode='custom' match='exact'> <model fallback='forbid'>Westmere</model> - <feature policy='require' name='fpu'/> - <feature policy='require' name='de'/> - <feature policy='require' name='pse'/> - <feature policy='require' name='tsc'/> - <feature policy='require' name='msr'/> - <feature policy='require' name='pae'/> - <feature policy='require' name='mce'/> - <feature policy='require' name='cx8'/> + <feature policy='require' name='aes'/> <feature policy='require' name='apic'/> - <feature policy='require' name='sep'/> - <feature policy='require' name='mtrr'/> - <feature policy='require' name='pge'/> - <feature policy='require' name='mca'/> - <feature policy='require' name='cmov'/> - <feature policy='require' name='pat'/> - <feature policy='require' name='pse36'/> <feature policy='require' name='clflush'/> - <feature policy='require' name='mmx'/> + <feature policy='require' name='cmov'/> + <feature policy='require' name='cx16'/> + <feature policy='require' name='cx8'/> + <feature policy='require' name='de'/> + <feature policy='require' name='fpu'/> <feature policy='require' name='fxsr'/> + <feature policy='require' name='lahf_lm'/> + <feature policy='require' name='lm'/> + <feature policy='require' name='mca'/> + <feature policy='require' name='mce'/> + <feature policy='require' name='mmx'/> + <feature policy='require' name='msr'/> + <feature policy='require' name='mtrr'/> + <feature policy='require' name='nx'/> + <feature policy='require' name='pae'/> + <feature policy='require' name='pat'/> + <feature policy='require' name='pge'/> + <feature policy='require' name='pni'/> + <feature policy='require' name='popcnt'/> + <feature policy='require' name='pse'/> + <feature policy='require' name='pse36'/> + <feature policy='require' name='sep'/> <feature policy='require' name='sse'/> <feature policy='require' name='sse2'/> - <feature policy='require' name='pni'/> - <feature policy='require' name='ssse3'/> - <feature policy='require' name='cx16'/> <feature policy='require' name='sse4.1'/> <feature policy='require' name='sse4.2'/> - <feature policy='require' name='popcnt'/> - <feature policy='require' name='aes'/> + <feature policy='require' name='ssse3'/> <feature policy='require' name='syscall'/> - <feature policy='require' name='nx'/> - <feature policy='require' name='lm'/> - <feature policy='require' name='lahf_lm'/> + <feature policy='require' name='tsc'/> </cpu> diff --git a/tests/cputestdata/x86_64-baseline-4-expanded.xml b/tests/cputestdata/x86_64-baseline-4-expanded.xml index 7e4578e1a..e54eca026 100644 --- a/tests/cputestdata/x86_64-baseline-4-expanded.xml +++ b/tests/cputestdata/x86_64-baseline-4-expanded.xml @@ -1,46 +1,46 @@ <cpu mode='custom' match='exact'> <model fallback='forbid'>Westmere</model> <vendor>Intel</vendor> - <feature policy='require' name='vme'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='pclmuldq'/> - <feature policy='require' name='pcid'/> - <feature policy='require' name='x2apic'/> - <feature policy='require' name='tsc-deadline'/> - <feature policy='require' name='xsave'/> - <feature policy='require' name='osxsave'/> - <feature policy='require' name='avx'/> - <feature policy='require' name='hypervisor'/> - <feature policy='require' name='fpu'/> - <feature policy='require' name='de'/> - <feature policy='require' name='pse'/> - <feature policy='require' name='tsc'/> - <feature policy='require' name='msr'/> - <feature policy='require' name='pae'/> - <feature policy='require' name='mce'/> - <feature policy='require' name='cx8'/> + <feature policy='require' name='aes'/> <feature policy='require' name='apic'/> - <feature policy='require' name='sep'/> - <feature policy='require' name='mtrr'/> - <feature policy='require' name='pge'/> - <feature policy='require' name='mca'/> - <feature policy='require' name='cmov'/> - <feature policy='require' name='pat'/> - <feature policy='require' name='pse36'/> + <feature policy='require' name='avx'/> <feature policy='require' name='clflush'/> - <feature policy='require' name='mmx'/> + <feature policy='require' name='cmov'/> + <feature policy='require' name='cx16'/> + <feature policy='require' name='cx8'/> + <feature policy='require' name='de'/> + <feature policy='require' name='fpu'/> <feature policy='require' name='fxsr'/> + <feature policy='require' name='hypervisor'/> + <feature policy='require' name='lahf_lm'/> + <feature policy='require' name='lm'/> + <feature policy='require' name='mca'/> + <feature policy='require' name='mce'/> + <feature policy='require' name='mmx'/> + <feature policy='require' name='msr'/> + <feature policy='require' name='mtrr'/> + <feature policy='require' name='nx'/> + <feature policy='require' name='osxsave'/> + <feature policy='require' name='pae'/> + <feature policy='require' name='pat'/> + <feature policy='require' name='pcid'/> + <feature policy='require' name='pclmuldq'/> + <feature policy='require' name='pge'/> + <feature policy='require' name='pni'/> + <feature policy='require' name='popcnt'/> + <feature policy='require' name='pse'/> + <feature policy='require' name='pse36'/> + <feature policy='require' name='sep'/> + <feature policy='require' name='ss'/> <feature policy='require' name='sse'/> <feature policy='require' name='sse2'/> - <feature policy='require' name='pni'/> - <feature policy='require' name='ssse3'/> - <feature policy='require' name='cx16'/> <feature policy='require' name='sse4.1'/> <feature policy='require' name='sse4.2'/> - <feature policy='require' name='popcnt'/> - <feature policy='require' name='aes'/> + <feature policy='require' name='ssse3'/> <feature policy='require' name='syscall'/> - <feature policy='require' name='nx'/> - <feature policy='require' name='lm'/> - <feature policy='require' name='lahf_lm'/> + <feature policy='require' name='tsc'/> + <feature policy='require' name='tsc-deadline'/> + <feature policy='require' name='vme'/> + <feature policy='require' name='x2apic'/> + <feature policy='require' name='xsave'/> </cpu> diff --git a/tests/cputestdata/x86_64-baseline-5-expanded.xml b/tests/cputestdata/x86_64-baseline-5-expanded.xml index daef2a78f..2c1b40015 100644 --- a/tests/cputestdata/x86_64-baseline-5-expanded.xml +++ b/tests/cputestdata/x86_64-baseline-5-expanded.xml @@ -1,47 +1,47 @@ <cpu mode='custom' match='exact'> <model fallback='allow'>SandyBridge</model> <vendor>Intel</vendor> - <feature policy='require' name='vme'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='pcid'/> - <feature policy='require' name='osxsave'/> - <feature policy='require' name='hypervisor'/> - <feature policy='disable' name='rdtscp'/> - <feature policy='require' name='fpu'/> - <feature policy='require' name='de'/> - <feature policy='require' name='pse'/> - <feature policy='require' name='tsc'/> - <feature policy='require' name='msr'/> - <feature policy='require' name='pae'/> - <feature policy='require' name='mce'/> - <feature policy='require' name='cx8'/> + <feature policy='require' name='aes'/> <feature policy='require' name='apic'/> - <feature policy='require' name='sep'/> - <feature policy='require' name='mtrr'/> - <feature policy='require' name='pge'/> - <feature policy='require' name='mca'/> - <feature policy='require' name='cmov'/> - <feature policy='require' name='pat'/> - <feature policy='require' name='pse36'/> + <feature policy='require' name='avx'/> <feature policy='require' name='clflush'/> - <feature policy='require' name='mmx'/> + <feature policy='require' name='cmov'/> + <feature policy='require' name='cx16'/> + <feature policy='require' name='cx8'/> + <feature policy='require' name='de'/> + <feature policy='require' name='fpu'/> <feature policy='require' name='fxsr'/> + <feature policy='require' name='hypervisor'/> + <feature policy='require' name='lahf_lm'/> + <feature policy='require' name='lm'/> + <feature policy='require' name='mca'/> + <feature policy='require' name='mce'/> + <feature policy='require' name='mmx'/> + <feature policy='require' name='msr'/> + <feature policy='require' name='mtrr'/> + <feature policy='require' name='nx'/> + <feature policy='require' name='osxsave'/> + <feature policy='require' name='pae'/> + <feature policy='require' name='pat'/> + <feature policy='require' name='pcid'/> + <feature policy='require' name='pclmuldq'/> + <feature policy='require' name='pge'/> + <feature policy='require' name='pni'/> + <feature policy='require' name='popcnt'/> + <feature policy='require' name='pse'/> + <feature policy='require' name='pse36'/> + <feature policy='disable' name='rdtscp'/> + <feature policy='require' name='sep'/> + <feature policy='require' name='ss'/> <feature policy='require' name='sse'/> <feature policy='require' name='sse2'/> - <feature policy='require' name='pni'/> - <feature policy='require' name='pclmuldq'/> - <feature policy='require' name='ssse3'/> - <feature policy='require' name='cx16'/> <feature policy='require' name='sse4.1'/> <feature policy='require' name='sse4.2'/> - <feature policy='require' name='x2apic'/> - <feature policy='require' name='popcnt'/> - <feature policy='require' name='tsc-deadline'/> - <feature policy='require' name='aes'/> - <feature policy='require' name='xsave'/> - <feature policy='require' name='avx'/> + <feature policy='require' name='ssse3'/> <feature policy='require' name='syscall'/> - <feature policy='require' name='nx'/> - <feature policy='require' name='lm'/> - <feature policy='require' name='lahf_lm'/> + <feature policy='require' name='tsc'/> + <feature policy='require' name='tsc-deadline'/> + <feature policy='require' name='vme'/> + <feature policy='require' name='x2apic'/> + <feature policy='require' name='xsave'/> </cpu> -- 2.12.0

Let's make the object local to the parseFeatureWords function which uses it. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- tests/cputestdata/cpu-convert.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cputestdata/cpu-convert.py b/tests/cputestdata/cpu-convert.py index 898d42f10..e069408c8 100755 --- a/tests/cputestdata/cpu-convert.py +++ b/tests/cputestdata/cpu-convert.py @@ -174,6 +174,8 @@ cpuidMap = [ def parseFeatureWords(path): features = None + dec = json.JSONDecoder() + with open(path, "r") as f: s = f.read() @@ -220,8 +222,6 @@ def propAdd(props, feature, value): props[name] = value -dec = json.JSONDecoder() - for path in sys.argv[1:]: props, cpuid = parseFeatureWords(path) -- 2.12.0

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- tests/cputestdata/cpu-cpuid.py | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/tests/cputestdata/cpu-cpuid.py b/tests/cputestdata/cpu-cpuid.py index a4dc23378..9ea858d98 100755 --- a/tests/cputestdata/cpu-cpuid.py +++ b/tests/cputestdata/cpu-cpuid.py @@ -171,6 +171,24 @@ cpuidMap = [ ] +def cpuidIsSet(cpuid, feature): + in_eax = feature["in_eax"] + in_ecx = feature["in_ecx"] + eax = feature["eax"] + ebx = feature["ebx"] + ecx = feature["ecx"] + edx = feature["edx"] + + if in_eax not in cpuid or in_ecx not in cpuid[in_eax]: + return False + else: + leaf = cpuid[in_eax][in_ecx] + return ((eax > 0 and leaf["eax"] & eax > 0) or + (ebx > 0 and leaf["ebx"] & ebx > 0) or + (ecx > 0 and leaf["ecx"] & ecx > 0) or + (edx > 0 and leaf["edx"] & edx > 0)) + + def parseFeatureWords(path): features = None @@ -217,30 +235,13 @@ def parseFeatureWords(path): return props, cpuid -def propAdd(props, feature, value): - for name in feature["names"]: - props[name] = value - - def convert(path): props, cpuid = parseFeatureWords(path) for feature in cpuidMap: - in_eax = feature["in_eax"] - in_ecx = feature["in_ecx"] - eax = feature["eax"] - ebx = feature["ebx"] - ecx = feature["ecx"] - edx = feature["edx"] - - if in_eax not in cpuid or in_ecx not in cpuid[in_eax]: - propAdd(props, feature, False) - else: - leaf = cpuid[in_eax][in_ecx] - propAdd(props, feature, ((eax > 0 and leaf["eax"] & eax > 0) or - (ebx > 0 and leaf["ebx"] & ebx > 0) or - (ecx > 0 and leaf["ecx"] & ecx > 0) or - (edx > 0 and leaf["edx"] & edx > 0))) + value = cpuidIsSet(cpuid, feature) + for name in feature["names"]: + props[name] = value with open(path, "w") as f: json.dump({"return": {"model": {"name": "base", "props": props}}, -- 2.12.0

The new command can be used to generate test data for virCPUUpdateLive. When "cpu-cpuid.py diff x86-cpuid-Something.json" is run, it reads raw CPUID data stored in x86-cpuid-Something.xml and CPUID data from QEMU stored in x86-cpuid-Something.json to produce two more CPUID files: x86-cpuid-Something-enabled.xml and x86-cpuid-Something-disabled.xml. - x86-cpuid-Something-enabled.xml will contain CPUID bits present in x86-cpuid-Something.json (i.e., enabled by QEMU for the "host" CPU) - x86-cpuid-Something-disabled.xml will contain all CPUID bits from x86-cpuid-Something.xml which are not present in x86-cpuid-Something.json (i.e., CPUID bits which the host CPU supports, but QEMU does not enable them for the "host" CPU) Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- tests/cputestdata/cpu-cpuid.py | 89 +++++++++++++++++++++++++++++++++++++++++- tests/cputestdata/cpu-parse.sh | 1 + 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/tests/cputestdata/cpu-cpuid.py b/tests/cputestdata/cpu-cpuid.py index f4cf6d440..4b9b04ace 100755 --- a/tests/cputestdata/cpu-cpuid.py +++ b/tests/cputestdata/cpu-cpuid.py @@ -2,6 +2,7 @@ import sys import json +import xmltodict # This is a list of x86 CPU features as of QEMU 2.8.50 and it won't need any # updates since in the future because query-cpu-model-expansion will be used @@ -171,6 +172,16 @@ cpuidMap = [ ] +def reverseCpuidMap(): + features = {} + + for feature in cpuidMap: + for name in feature["names"]: + features[name] = feature + + return features + + def cpuidIsSet(cpuid, feature): in_eax = feature["in_eax"] in_ecx = feature["in_ecx"] @@ -201,6 +212,12 @@ def cpuidLeaf(cpuid, in_eax, in_ecx): return leaf +def cpuidAdd(cpuid, feature): + leaf = cpuidLeaf(cpuid, feature["in_eax"], feature["in_ecx"]) + for reg in ["eax", "ebx", "ecx", "edx"]: + leaf[reg] |= feature[reg] + + def parseFeatureWords(path): features = None @@ -240,6 +257,50 @@ def parseFeatureWords(path): return props, cpuid +def parseQemu(path, features): + cpuid = {} + with open(path, "r") as f: + data = json.load(f) + + for (prop, val) in data["return"]["model"]["props"].iteritems(): + if val and prop in features: + cpuidAdd(cpuid, features[prop]) + + return cpuid + + +def parseCpuid(path): + cpuid = {} + with open(path, "r") as f: + data = xmltodict.parse(f) + + for leaf in data["cpudata"]["cpuid"]: + leaf["in_eax"] = int(leaf["@eax_in"], 0) + leaf["in_ecx"] = int(leaf["@ecx_in"], 0) + for reg in ["eax", "ebx", "ecx", "edx"]: + leaf[reg] = int(leaf["@" + reg], 0) + + cpuidAdd(cpuid, leaf) + + return cpuid + + +def formatCpuid(cpuid, path, comment): + with open(path, "w") as f: + f.write("<!-- " + comment + " -->\n") + f.write("<cpudata arch='x86'>\n") + for in_eax in sorted(cpuid.keys()): + for in_ecx in sorted(cpuid[in_eax].keys()): + leaf = cpuid[in_eax][in_ecx] + line = " <cpuid eax_in='0x%08x' ecx_in='0x%02x' " + line += "eax='0x%08x' ebx='0x%08x' " + line += "ecx='0x%08x' edx='0x%08x'/>\n" + f.write(line %( + in_eax, in_ecx, + leaf["eax"], leaf["ebx"], leaf["ecx"], leaf["edx"])) + f.write("</cpudata>\n") + + def convert(path): props, cpuid = parseFeatureWords(path) @@ -255,8 +316,30 @@ def convert(path): f.write("\n") +def diff(features, path): + base = path.replace(".json", "") + jsonFile = path + cpuidFile = base + ".xml" + enabledFile = base + "-enabled.xml" + disabledFile = base + "-disabled.xml" + + cpuid = parseCpuid(cpuidFile) + qemu = parseQemu(jsonFile, features) + + enabled = {} + disabled = {} + for feature in cpuidMap: + if cpuidIsSet(qemu, feature): + cpuidAdd(enabled, feature) + elif cpuidIsSet(cpuid, feature): + cpuidAdd(disabled, feature) + + formatCpuid(enabled, enabledFile, "Features enabled by QEMU") + formatCpuid(disabled, disabledFile, "Features disabled by QEMU") + + if len(sys.argv) < 3: - print "Usage: %s convert json_file..." % sys.argv[0] + print "Usage: %s convert|diff json_file..." % sys.argv[0] sys.exit(1) action = sys.argv[1] @@ -265,6 +348,10 @@ args = sys.argv[2:] if action == "convert": for path in args: convert(path) +elif action == "diff": + features = reverseCpuidMap() + for path in args: + diff(features, path) else: print "Unknown action: " + action sys.exit(1) diff --git a/tests/cputestdata/cpu-parse.sh b/tests/cputestdata/cpu-parse.sh index d823c399b..cd1ab024b 100755 --- a/tests/cputestdata/cpu-parse.sh +++ b/tests/cputestdata/cpu-parse.sh @@ -55,6 +55,7 @@ if [[ -s $fname.json ]]; then if ! grep -q model-expansion $fname.json; then $(dirname $0)/cpu-cpuid.py convert $fname.json fi + $(dirname $0)/cpu-cpuid.py diff $fname.json else rm $fname.json fi -- 2.12.0

Generated with (cd tests/cputestdata; ./cpu-cpuid.py diff x86_64-cpuid-*.json) Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml | 7 +++++++ tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml | 8 ++++++++ tests/cputestdata/x86_64-cpuid-Core-i5-2500-disabled.xml | 5 +++++ tests/cputestdata/x86_64-cpuid-Core-i5-2500-enabled.xml | 9 +++++++++ tests/cputestdata/x86_64-cpuid-Core-i5-2540M-disabled.xml | 5 +++++ tests/cputestdata/x86_64-cpuid-Core-i5-2540M-enabled.xml | 9 +++++++++ tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml | 6 ++++++ tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml | 8 ++++++++ tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml | 5 +++++ tests/cputestdata/x86_64-cpuid-Core-i5-6600-enabled.xml | 9 +++++++++ tests/cputestdata/x86_64-cpuid-Core-i7-2600-disabled.xml | 6 ++++++ tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml | 8 ++++++++ tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-disabled.xml | 6 ++++++ tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-enabled.xml | 8 ++++++++ tests/cputestdata/x86_64-cpuid-Core-i7-3770-disabled.xml | 6 ++++++ tests/cputestdata/x86_64-cpuid-Core-i7-3770-enabled.xml | 8 ++++++++ tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml | 5 +++++ tests/cputestdata/x86_64-cpuid-Core-i7-4510U-enabled.xml | 9 +++++++++ tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml | 5 +++++ tests/cputestdata/x86_64-cpuid-Core-i7-4600U-enabled.xml | 9 +++++++++ tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml | 5 +++++ tests/cputestdata/x86_64-cpuid-Core-i7-5600U-enabled.xml | 9 +++++++++ tests/cputestdata/x86_64-cpuid-Core2-E6850-disabled.xml | 4 ++++ tests/cputestdata/x86_64-cpuid-Core2-E6850-enabled.xml | 7 +++++++ tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml | 7 +++++++ tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml | 7 +++++++ tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml | 7 +++++++ tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml | 9 +++++++++ tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml | 7 +++++++ tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml | 7 +++++++ tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml | 6 ++++++ tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml | 9 +++++++++ tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml | 6 ++++++ tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-enabled.xml | 8 ++++++++ tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml | 8 ++++++++ tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml | 7 +++++++ tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-disabled.xml | 6 ++++++ tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-enabled.xml | 7 +++++++ tests/cputestdata/x86_64-cpuid-Xeon-W3520-disabled.xml | 5 +++++ tests/cputestdata/x86_64-cpuid-Xeon-W3520-enabled.xml | 7 +++++++ 40 files changed, 279 insertions(+) create mode 100644 tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2500-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2500-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2540M-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2540M-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-6600-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3770-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3770-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-4510U-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-4600U-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core2-E6850-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core2-E6850-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-W3520-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-W3520-enabled.xml diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml new file mode 100644 index 000000000..3bacf2cf9 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml @@ -0,0 +1,7 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x08000008' edx='0x10000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01cab40c' edx='0x08000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> + <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000014f6'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml new file mode 100644 index 000000000..a97702df9 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml @@ -0,0 +1,8 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xb6b83203' edx='0x078bfbff'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x0000000a' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00210bf3' edx='0x26500800'/> + <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000009'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-disabled.xml new file mode 100644 index 000000000..510cd97a5 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-disabled.xml @@ -0,0 +1,5 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-enabled.xml new file mode 100644 index 000000000..1581f800f --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-enabled.xml @@ -0,0 +1,9 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x97ba2203' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-disabled.xml new file mode 100644 index 000000000..510cd97a5 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-disabled.xml @@ -0,0 +1,5 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-enabled.xml new file mode 100644 index 000000000..1581f800f --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-enabled.xml @@ -0,0 +1,9 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x97ba2203' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml new file mode 100644 index 000000000..601554a81 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml @@ -0,0 +1,6 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml new file mode 100644 index 000000000..8a714379c --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml @@ -0,0 +1,8 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000fbb' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000021' edx='0x2c100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml new file mode 100644 index 000000000..510cd97a5 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml @@ -0,0 +1,5 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-enabled.xml new file mode 100644 index 000000000..13032d0d2 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-enabled.xml @@ -0,0 +1,9 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-disabled.xml new file mode 100644 index 000000000..f25d2888e --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-disabled.xml @@ -0,0 +1,6 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml new file mode 100644 index 000000000..df99a2180 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml @@ -0,0 +1,8 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x97ba2203' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-disabled.xml new file mode 100644 index 000000000..601554a81 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-disabled.xml @@ -0,0 +1,6 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-enabled.xml new file mode 100644 index 000000000..e596bf119 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-enabled.xml @@ -0,0 +1,8 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7ba2223' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000283' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-disabled.xml new file mode 100644 index 000000000..f25d2888e --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-disabled.xml @@ -0,0 +1,6 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-enabled.xml new file mode 100644 index 000000000..666c37536 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-enabled.xml @@ -0,0 +1,8 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7ba2203' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000283' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml new file mode 100644 index 000000000..dbc978e73 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml @@ -0,0 +1,5 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c19c' edx='0xb0600000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-enabled.xml new file mode 100644 index 000000000..86896de80 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-enabled.xml @@ -0,0 +1,9 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x000007ab' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000021' edx='0x2c100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml new file mode 100644 index 000000000..4a0477f78 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml @@ -0,0 +1,5 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-enabled.xml new file mode 100644 index 000000000..86896de80 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-enabled.xml @@ -0,0 +1,9 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x000007ab' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000021' edx='0x2c100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml new file mode 100644 index 000000000..4a0477f78 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml @@ -0,0 +1,5 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-enabled.xml new file mode 100644 index 000000000..edc433c9a --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-enabled.xml @@ -0,0 +1,9 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x001c0fbb' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-disabled.xml new file mode 100644 index 000000000..18e4baf3a --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-disabled.xml @@ -0,0 +1,4 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0000c1fc' edx='0xb0600000'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-enabled.xml new file mode 100644 index 000000000..af4f6f7ab --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-enabled.xml @@ -0,0 +1,7 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x81202201' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x20100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml new file mode 100644 index 000000000..3f6fe5405 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml @@ -0,0 +1,7 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000008' edx='0x10000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000408' edx='0x08000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> + <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml new file mode 100644 index 000000000..7541dff65 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml @@ -0,0 +1,7 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x81a02001' edx='0x078bfbff'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x000003f7' edx='0xe6500800'/> + <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000001'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml new file mode 100644 index 000000000..4dcd74103 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml @@ -0,0 +1,7 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x08000008' edx='0x10000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01c8b40c' edx='0x08000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> + <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x000014f6'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml new file mode 100644 index 000000000..c4cfbcef2 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml @@ -0,0 +1,9 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x97b82203' edx='0x078bfbff'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00010bf3' edx='0x26500800'/> + <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000009'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml new file mode 100644 index 000000000..3910eb6e5 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml @@ -0,0 +1,7 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000008' edx='0x10000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0000340c' edx='0x08000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> + <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml new file mode 100644 index 000000000..a8cd01ff4 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml @@ -0,0 +1,7 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x80a02001' edx='0x078bfbff'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x000003f3' edx='0xe6400800'/> + <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000009'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml new file mode 100644 index 000000000..1a177705a --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml @@ -0,0 +1,6 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml new file mode 100644 index 000000000..258404233 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml @@ -0,0 +1,9 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000007' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml new file mode 100644 index 000000000..ea2906506 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml @@ -0,0 +1,6 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-enabled.xml new file mode 100644 index 000000000..1c2367a3d --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-enabled.xml @@ -0,0 +1,8 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x000007ab' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000021' edx='0x2c100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml new file mode 100644 index 000000000..a66b5bdd6 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml @@ -0,0 +1,8 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml new file mode 100644 index 000000000..4c194af10 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml @@ -0,0 +1,7 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x000007a9' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000021' edx='0x2c100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-disabled.xml new file mode 100644 index 000000000..e7e0ee6f2 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-disabled.xml @@ -0,0 +1,6 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0004c1fc' edx='0xb0600000'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-enabled.xml new file mode 100644 index 000000000..cddc4a675 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-enabled.xml @@ -0,0 +1,7 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x83ba2203' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x2c100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-disabled.xml new file mode 100644 index 000000000..49737fbdb --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-disabled.xml @@ -0,0 +1,5 @@ +<!-- Features disabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0004c1bc' edx='0xb0600000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-enabled.xml new file mode 100644 index 000000000..febef1edd --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-enabled.xml @@ -0,0 +1,7 @@ +<!-- Features enabled by QEMU --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x80b82201' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/> +</cpudata> -- 2.12.0

All CPU features which QEMU does not know about but libvirt knows them (currently "cmt" is the only one) are implicitly disabled by QEMU and should be present in x86_64-cpuid-*-disabled.xml. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- tests/cputestdata/cpu-cpuid.py | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/cputestdata/cpu-cpuid.py b/tests/cputestdata/cpu-cpuid.py index 4b9b04ace..85c7c94b1 100755 --- a/tests/cputestdata/cpu-cpuid.py +++ b/tests/cputestdata/cpu-cpuid.py @@ -79,6 +79,7 @@ cpuidMap = [ {"in_eax": 0x00000007, "in_ecx": 0, "eax": 0, "ebx": 0x00000200, "ecx": 0, "edx": 0, "names": ["erms"]}, {"in_eax": 0x00000007, "in_ecx": 0, "eax": 0, "ebx": 0x00000400, "ecx": 0, "edx": 0, "names": ["invpcid"]}, {"in_eax": 0x00000007, "in_ecx": 0, "eax": 0, "ebx": 0x00000800, "ecx": 0, "edx": 0, "names": ["rtm"]}, + {"in_eax": 0x00000007, "in_ecx": 0, "eax": 0, "ebx": 0x00001000, "ecx": 0, "edx": 0, "names": []}, # cmt is unknown to QEMU {"in_eax": 0x00000007, "in_ecx": 0, "eax": 0, "ebx": 0x00004000, "ecx": 0, "edx": 0, "names": ["mpx"]}, {"in_eax": 0x00000007, "in_ecx": 0, "eax": 0, "ebx": 0x00010000, "ecx": 0, "edx": 0, "names": ["avx512f"]}, {"in_eax": 0x00000007, "in_ecx": 0, "eax": 0, "ebx": 0x00020000, "ecx": 0, "edx": 0, "names": ["avx512dq"]}, diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml index ea2906506..e6f4ce761 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml @@ -2,5 +2,6 @@ <cpudata arch='x86'> <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/> <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000000' edx='0x00000000'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml index a66b5bdd6..9e25e6a94 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml @@ -2,7 +2,7 @@ <cpudata arch='x86'> <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/> <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> - <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001002' ecx='0x00000000' edx='0x00000000'/> <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> </cpudata> -- 2.12.0

On 03/17/2017 12:36 PM, Jiri Denemark wrote: I know it's only a test, but this log message raised Coverity's attention because it's not sure featAct is NULL at this point if "cmp > 0". So that I can at least mask it my local tree - could featAct be NULL or should there be a different message if cmp > 0? Tks - John