[libvirt PATCH 04/29] cpu-gather: Allow overwriting model name

Tim Wiederhake twiederh at redhat.com
Tue Dec 15 16:24:50 UTC 2020


Some hardware, e.g. exotic platforms or pre-production hardware, may
report wrong or random data for the cpu model name. As the name of
the created files is derived from that name, this may lead to issues.

Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
---
 tests/cputestdata/cpu-gather.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/tests/cputestdata/cpu-gather.py b/tests/cputestdata/cpu-gather.py
index 1b02df6ec7..4e8c72e4f4 100755
--- a/tests/cputestdata/cpu-gather.py
+++ b/tests/cputestdata/cpu-gather.py
@@ -1,20 +1,33 @@
 #!/usr/bin/env python3
 
+import argparse
 import os
 import subprocess
 
 
-def gather_name():
+def gather_name(args):
+    if args.name:
+        return args.name
+
     with open("/proc/cpuinfo", "rt") as f:
         for line in f.readlines():
             if line.startswith("model name"):
                 return line.split(":", 2)[1].strip()
 
-    exit("Error: '/proc/cpuinfo' does not contain a model name.")
+    exit("Error: '/proc/cpuinfo' does not contain a model name.\n"
+         "Use '--model' to set a model name.")
 
 
 def main():
-    name = gather_name()
+    parser = argparse.ArgumentParser(description="Gather cpu test data")
+    parser.add_argument(
+        "--name",
+        help="CPU model name. "
+        "If unset, model name is read from '/proc/cpuinfo'.")
+
+    args = parser.parse_args()
+
+    name = gather_name(args)
     print("model name\t: {}".format(name))
 
     print(end="", flush=True)
-- 
2.26.2




More information about the libvir-list mailing list