The cpuidMap in cpu-cpuid.py was created for converting old data files (with QEMU's feature-words bits) to the new model-expansion based data. When I added tests for CPU live update based on disabled/enabled feature lists I shamelessly used the existing cpuidMap for generating the *-{enabled,disabled}.xml data files. Thus any new CPUID bits which are not present in the original cpuidMap would be ignored. The correct thing to do is to use cpu_map.xml. All data files were fixed by running the following command: ./cpu-cpuid.py diff *.json Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- tests/cputestdata/cpu-cpuid.py | 52 +++++++++++++++------- .../x86_64-cpuid-A10-5800K-disabled.xml | 1 - .../cputestdata/x86_64-cpuid-A10-5800K-enabled.xml | 2 - .../x86_64-cpuid-Core-i5-2500-enabled.xml | 1 - .../x86_64-cpuid-Core-i5-2540M-enabled.xml | 1 - .../x86_64-cpuid-Core-i5-4670T-enabled.xml | 1 - .../x86_64-cpuid-Core-i5-6600-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-2600-enabled.xml | 1 - ...x86_64-cpuid-Core-i7-2600-xsaveopt-disabled.xml | 1 - .../x86_64-cpuid-Core-i7-2600-xsaveopt-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-3740QM-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-3770-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-4510U-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-4600U-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-5600U-arat-disabled.xml | 1 + .../x86_64-cpuid-Core-i7-5600U-arat-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-5600U-enabled.xml | 1 - .../x86_64-cpuid-Core-i7-7700-enabled.xml | 1 - .../x86_64-cpuid-Core2-E6850-enabled.xml | 1 - .../x86_64-cpuid-EPYC-7601-32-Core-disabled.xml | 1 - .../x86_64-cpuid-EPYC-7601-32-Core-enabled.xml | 2 - .../x86_64-cpuid-Opteron-2350-disabled.xml | 1 - .../x86_64-cpuid-Opteron-2350-enabled.xml | 2 - .../x86_64-cpuid-Opteron-6234-disabled.xml | 1 - .../x86_64-cpuid-Opteron-6234-enabled.xml | 2 - .../x86_64-cpuid-Phenom-B95-disabled.xml | 1 - .../x86_64-cpuid-Phenom-B95-enabled.xml | 2 - ..._64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml | 1 - ...6_64-cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml | 2 - .../x86_64-cpuid-Xeon-E3-1245-v5-enabled.xml | 1 - .../x86_64-cpuid-Xeon-E5-2630-v3-enabled.xml | 1 - .../x86_64-cpuid-Xeon-E5-2650-v3-enabled.xml | 1 - .../x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml | 1 + .../x86_64-cpuid-Xeon-E5-2650-v4-enabled.xml | 1 - .../x86_64-cpuid-Xeon-E7-4820-enabled.xml | 1 - .../x86_64-cpuid-Xeon-E7-4830-enabled.xml | 1 - .../x86_64-cpuid-Xeon-E7-8890-v3-enabled.xml | 1 - .../x86_64-cpuid-Xeon-Gold-6148-disabled.xml | 1 + .../x86_64-cpuid-Xeon-Gold-6148-enabled.xml | 1 - .../x86_64-cpuid-Xeon-W3520-enabled.xml | 1 - 40 files changed, 40 insertions(+), 57 deletions(-) diff --git a/tests/cputestdata/cpu-cpuid.py b/tests/cputestdata/cpu-cpuid.py index 4fe8e8b952..b74c3ce932 100755 --- a/tests/cputestdata/cpu-cpuid.py +++ b/tests/cputestdata/cpu-cpuid.py @@ -1,5 +1,6 @@ #!/usr/bin/env python2 +import os import sys import json import xmltodict @@ -173,16 +174,6 @@ 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"] @@ -292,6 +283,37 @@ def parseCpuid(path): return cpuid +def parseFeature(data): + cpuid = {} + for reg in ["in_eax", "in_ecx", "eax", "ebx", "ecx", "edx"]: + if reg.startswith("in_"): + attr = "@%s_in" % reg[3:] + else: + attr = "@%s" % reg + + if attr in data: + cpuid[reg] = int(data[attr], 0) + else: + cpuid[reg] = 0 + + return cpuid + + +def parseMap(): + path = os.path.dirname(sys.argv[0]) + path = os.path.join(path, "..", "..", "src", "cpu", "cpu_map.xml") + with open(path, "r") as f: + data = xmltodict.parse(f) + + cpuMap = {} + for arch in data["cpus"]["arch"]: + if arch["@name"] == "x86": + for feature in arch["feature"]: + cpuMap[feature["@name"]] = parseFeature(feature["cpuid"]) + + return cpuMap + + def formatCpuid(cpuid, path, comment): print path with open(path, "w") as f: @@ -330,7 +352,7 @@ def convert(path): f.write("\n") -def diff(features, path): +def diff(cpuMap, path): base = path.replace(".json", "") jsonFile = path cpuidFile = base + ".xml" @@ -338,11 +360,11 @@ def diff(features, path): disabledFile = base + "-disabled.xml" cpuid = parseCpuid(cpuidFile) - qemu = parseQemu(jsonFile, features) + qemu = parseQemu(jsonFile, cpuMap) enabled = {} disabled = {} - for feature in cpuidMap: + for feature in cpuMap.values(): if cpuidIsSet(qemu, feature): cpuidAdd(enabled, feature) elif cpuidIsSet(cpuid, feature): @@ -363,9 +385,9 @@ if action == "convert": for path in args: convert(path) elif action == "diff": - features = reverseCpuidMap() + cpuMap = parseMap() for path in args: - diff(features, path) + diff(cpuMap, path) else: print "Unknown action: " + action sys.exit(1) diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml index 3bacf2cf95..6ed5b3573b 100644 --- a/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml @@ -3,5 +3,4 @@ <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 index a97702df90..5cae0b7130 100644 --- a/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml @@ -2,7 +2,5 @@ <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-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-enabled.xml index 1581f800f1..b1d0fd59f5 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-enabled.xml @@ -4,6 +4,5 @@ <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-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-enabled.xml index 1581f800f1..b1d0fd59f5 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-enabled.xml @@ -4,6 +4,5 @@ <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-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml index 31893c0b87..84e061e878 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml @@ -3,6 +3,5 @@ <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='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-i5-6600-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-enabled.xml index 13032d0d2a..6c87cdfb5d 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-enabled.xml @@ -4,6 +4,5 @@ <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-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml index 1581f800f1..b1d0fd59f5 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml @@ -4,6 +4,5 @@ <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-i7-2600-xsaveopt-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-disabled.xml index 281cc1512a..510cd97a5b 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-disabled.xml @@ -1,6 +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='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-Core-i7-2600-xsaveopt-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-enabled.xml index 3c2d7e33d6..3c3eb65c40 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-enabled.xml @@ -3,6 +3,5 @@ <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='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-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-enabled.xml index e596bf119f..84104c16af 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-enabled.xml @@ -3,6 +3,5 @@ <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-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-enabled.xml index 666c375368..6889f19b31 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-enabled.xml @@ -3,6 +3,5 @@ <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-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-enabled.xml index 86896de809..ae85ae9f9e 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-enabled.xml @@ -4,6 +4,5 @@ <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-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-enabled.xml index 86896de809..ae85ae9f9e 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-enabled.xml @@ -4,6 +4,5 @@ <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-arat-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml index 4a0477f788..601554a815 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml @@ -1,5 +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-5600U-arat-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-enabled.xml index 5cffacef59..feba4cdc87 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-enabled.xml @@ -3,6 +3,5 @@ <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='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-Core-i7-5600U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-enabled.xml index edc433c9ae..b5d116672f 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-enabled.xml @@ -4,6 +4,5 @@ <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-Core-i7-7700-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-enabled.xml index 9096a633a7..48e17883cf 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-enabled.xml @@ -4,6 +4,5 @@ <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-Core2-E6850-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-enabled.xml index af4f6f7ab1..662fe303f3 100644 --- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-enabled.xml @@ -2,6 +2,5 @@ <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-EPYC-7601-32-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml index d3070d4147..747d725acf 100644 --- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml @@ -4,5 +4,4 @@ <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01c2300c' edx='0x00000000'/> <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-EPYC-7601-32-Core-enabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-enabled.xml index 6e47d40066..70b75f7115 100644 --- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-enabled.xml @@ -4,7 +4,5 @@ <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='0x209c01ab' 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='0x000003f3' edx='0x2e500800'/> - <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000009'/> </cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml index 3f6fe54055..8ec1b12582 100644 --- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml @@ -3,5 +3,4 @@ <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 index 7541dff65a..913980f15f 100644 --- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml @@ -1,7 +1,5 @@ <!-- 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 index 4dcd74103b..88124d1745 100644 --- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml @@ -3,5 +3,4 @@ <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 index c4cfbcef2d..38d716449d 100644 --- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml @@ -3,7 +3,5 @@ <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 index 3910eb6e57..d8d4e8a5f9 100644 --- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml @@ -3,5 +3,4 @@ <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 index a8cd01ff46..d15e625087 100644 --- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml @@ -1,7 +1,5 @@ <!-- 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-Ryzen-7-1800X-Eight-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml index 9ee1e78244..b085050618 100644 --- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml @@ -5,5 +5,4 @@ <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01c23008' edx='0x00000000'/> <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-Ryzen-7-1800X-Eight-Core-enabled.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml index 9c85bb63a2..a212679fba 100644 --- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml @@ -4,7 +4,5 @@ <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='0x009c01ab' 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='0x000003f7' edx='0x2e500800'/> - <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-v5-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-enabled.xml index f31f7317b6..3bd870970c 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-enabled.xml @@ -4,6 +4,5 @@ <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-Xeon-E5-2630-v3-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-enabled.xml index 1c2367a3d0..b54551b3b9 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-enabled.xml @@ -3,6 +3,5 @@ <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-v3-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-enabled.xml index 4c194af10f..0c236e1e09 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-enabled.xml @@ -2,6 +2,5 @@ <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-E5-2650-v4-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml index aacc7a2b14..d904808cec 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-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='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/> <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-v4-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-enabled.xml index b11dd9b759..f2d4f2826d 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-enabled.xml @@ -4,6 +4,5 @@ <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-Xeon-E7-4820-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-enabled.xml index cddc4a675e..3d04493f4d 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-enabled.xml @@ -2,6 +2,5 @@ <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-E7-4830-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-enabled.xml index 1b80f414e5..7941de5065 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-enabled.xml @@ -3,6 +3,5 @@ <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x83ba2203' 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='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-E7-8890-v3-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-enabled.xml index 026a049f77..ca1560af6e 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-enabled.xml @@ -4,6 +4,5 @@ <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='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-Xeon-Gold-6148-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml index f11079772b..b5c70a9dc4 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml @@ -3,5 +3,6 @@ <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/> <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000008' edx='0x00000000'/> <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/> <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-Gold-6148-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-enabled.xml index 431e4ed563..1db200aee9 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-enabled.xml @@ -4,6 +4,5 @@ <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='0xd19f4fbb' 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-W3520-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-enabled.xml index febef1eddc..8378945c45 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-enabled.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-enabled.xml @@ -2,6 +2,5 @@ <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.15.1

When specifying a new CPU model in cpu_map.xml as an extension to an existing model, we forgot to copy the signature (family + model) from the original CPU model. We don't use this way of specifying CPU models, but it's still supported and it becomes useful when someone wants to quickly hack up a CPU model for testing or when creating additional variants of existing models to help with fixing some spectral issues. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/cpu/cpu_x86.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 2a2f7cbf39..b2398c5ad2 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1227,6 +1227,7 @@ x86ModelParse(xmlXPathContextPtr ctxt, VIR_FREE(name); model->vendor = ancestor->vendor; + model->signature = ancestor->signature; if (x86DataCopy(&model->data, &ancestor->data) < 0) goto error; } -- 2.15.1