External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu-cpuid: Merge addFeature functions

Browse Source 
Prepare to deduplicate the list of relevant registers for cpuid and
msr information.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-01-04 12:30:14 +01:00 committed by Jiri Denemark
parent 5868cfc490
commit 41460d4c15
1 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,41 +54,25 @@ def checkFeature(cpuData, feature):
return checkMSRFeature(cpuData, feature)
def addCPUIDFeature(cpuData, feature):
if "cpuid" not in cpuData:
cpuData["cpuid"] = {}
cpuid = cpuData["cpuid"]
if feature["eax_in"] not in cpuid:
cpuid[feature["eax_in"]] = {}
leaf = cpuid[feature["eax_in"]]
if feature["ecx_in"] not in leaf:
leaf[feature["ecx_in"]] = {"eax": 0, "ebx": 0, "ecx": 0, "edx": 0}
leaf = leaf[feature["ecx_in"]]
for reg in ["eax", "ebx", "ecx", "edx"]:
leaf[reg] |= feature[reg]
def addMSRFeature(cpuData, feature):
if "msr" not in cpuData:
cpuData["msr"] = {}
msr = cpuData["msr"]
if feature["index"] not in msr:
msr[feature["index"]] = {"edx": 0, "eax": 0}
msr = msr[feature["index"]]
for reg in ["edx", "eax"]:
msr[reg] |= feature[reg]
def addFeature(cpuData, feature):
if feature["type"] == "cpuid":
addCPUIDFeature(cpuData, feature)
# cpuData["cpuid"][eax_in][ecx_in] = {eax:, ebx:, ecx:, edx:}
keyList = ["type", "eax_in", "ecx_in"]
regList = ["eax", "ebx", "ecx", "edx"]
elif feature["type"] == "msr":
addMSRFeature(cpuData, feature)
# cpuData["msr"][index] = {eax:, edx:}
keyList = ["type", "index"]
regList = ["eax", "edx"]
else:
return
for key in keyList:
if feature[key] not in cpuData:
cpuData[feature[key]] = dict()
cpuData = cpuData[feature[key]]
for reg in regList:
cpuData[reg] = cpuData.get(reg, 0) | feature[reg]
def parseQemu(path, features):