File 5ea187bc-cputest-Fix-cpu-cpuid.py-diff-command.... of Package libvirt.10106

Overview Repositories Revisions Requests Users Attributes Meta

File 5ea187bc-cputest-Fix-cpu-cpuid.py-diff-command.patch of Package libvirt.10106

From 5ea187bc83d61367dca8a3afe8a8c803d2932c77 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 5 Jan 2018 14:35:42 +0100
Subject: [PATCH 1/3] cputest: Fix cpu-cpuid.py diff command

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@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---
 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(-)

Index: libvirt-3.3.0/tests/cputestdata/cpu-cpuid.py
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/cpu-cpuid.py
+++ libvirt-3.3.0/tests/cputestdata/cpu-cpuid.py
@@ -1,5 +1,6 @@
 #!/usr/bin/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"]
@@ -287,6 +278,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):
     with open(path, "w") as f:
         f.write("\n")
@@ -318,7 +340,7 @@ def convert(path):
         f.write("\n")
 
 
-def diff(features, path):
+def diff(cpuMap, path):
     base = path.replace(".json", "")
     jsonFile = path
     cpuidFile = base + ".xml"
@@ -326,11 +348,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):
@@ -351,9 +373,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)
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Core-i5-2500-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Core-i5-2500-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Core-i5-6600-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Core-i5-6600-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml
+++ libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Core-i7-2600-enabled.xml
@@ -3,6 +3,5 @@
   <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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Core-i7-3770-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Core-i7-3770-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Core2-E6850-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Core2-E6850-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml
+++ libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml
@@ -1,7 +1,5 @@
 
 <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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml
+++ libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml
@@ -1,7 +1,5 @@
 
 <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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-enabled.xml
+++ libvirt-3.3.0/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>
Index: libvirt-3.3.0/tests/cputestdata/x86_64-cpuid-Xeon-W3520-enabled.xml
===================================================================
--- libvirt-3.3.0.orig/tests/cputestdata/x86_64-cpuid-Xeon-W3520-enabled.xml
+++ libvirt-3.3.0/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>

Places

File 5ea187bc-cputest-Fix-cpu-cpuid.py-diff-command.patch of Package libvirt.10106

Places