External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

cputest: Adapt scripts to split cpu_map

Browse Source 
The tests/cputestdata/cpu-parse.sh script has been broken since the
cpu_map.xml file was split into several XMLs.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2019-02-21 20:10:48 +01:00
parent cb6a46364b
commit 78b148c3c8
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cputestdata/cpu-cpuid.py
View File

@ -301,15 +301,13 @@ def parseFeature(data):
def parseMap(): def parseMap():
path = os.path.dirname(sys.argv[0]) path = os.path.dirname(sys.argv[0])
path = os.path.join(path, "..", "..", "src", "cpu", "cpu_map.xml") path = os.path.join(path, "..", "..", "src", "cpu_map", "x86_features.xml")
with open(path, "r") as f: with open(path, "r") as f:
data = xmltodict.parse(f) data = xmltodict.parse(f)
cpuMap = {} cpuMap = {}
for arch in data["cpus"]["arch"]: for feature in data["cpus"]["feature"]:
if arch["@name"] == "x86": cpuMap[feature["@name"]] = parseFeature(feature["cpuid"])
for feature in arch["feature"]:
cpuMap[feature["@name"]] = parseFeature(feature["cpuid"])
return cpuMap return cpuMap