External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 05:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu-parse: Move file name generation to new script

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2020-12-15 17:25:05 +01:00 committed by Michal Privoznik
parent 29584c4a48
commit 43d3703d3a
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/cputestdata/cpu-gather.py
View File

@ -4,6 +4,7 @@ import argparse
import fcntl
import json
import os
import re
import struct
import subprocess
import sys
@ -192,11 +193,28 @@ def gather(args):
return result
def parse_filename(data):
filename = data["name"].strip()
filename = re.sub("[ -]+ +", " ", filename)
filename = re.sub("\\(([Rr]|[Tt][Mm])\\)", "", filename)
filename = re.sub(".*(Intel|AMD) ", "", filename)
filename = re.sub(" (Duo|Quad|II X[0-9]+)", " ", filename)
filename = re.sub(" (CPU|Processor)", "", filename)
filename = re.sub(" @.*", "", filename)
filename = re.sub(" APU .*", "", filename)
filename = re.sub(" SE$", "", filename)
filename = re.sub(" ", "-", filename)
return "x86_64-cpuid-{}".format(filename)
def parse(args):
data = json.load(sys.stdin)
filename = parse_filename(data)
os.environ["CPU_GATHER_PY"] = "true"
os.environ["model"] = data["name"]
os.environ["fname"] = filename
output = subprocess.check_output(
"./cpu-parse.sh",
input=output_to_text(data),

13
tests/cputestdata/cpu-parse.sh
View File

@ -7,19 +7,6 @@ fi
data=`cat`
fname=`sed -e 's/^ *//;
s/ *$//;
s/[ -]\+ \+/ /g;
s/(\([Rr]\|[Tt][Mm]\))//g;
s/.*\(Intel\|AMD\) //;
s/ \(Duo\|Quad\|II X[0-9]\+\) / /;
s/ \(CPU\|Processor\)\>//;
s/ @.*//;
s/ APU .*//;
s/ SE$//;
s/ /-/g' <<<"$model"`
fname="x86_64-cpuid-$fname"
xml()
{
hex='\(0x[0-9a-f]\+\)'