From: Jiri Denemark <jdenemar@redhat.com>
Date: Mon, 21 Oct 2024 11:00:26 +0000 (+0200)
Subject: sync_qemu_models_i386: Do not require full path to QEMU's cpu.c
X-Git-Tag: v10.10.0-rc1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=515568071d56421ca8ab498cce1be199b6417c97;p=thirdparty%2Flibvirt.git

sync_qemu_models_i386: Do not require full path to QEMU's cpu.c

While the script for synchronizing CPU features expects a path to QEMU
source tree, this CPU model script insisted on getting a full patch to
cpu.c file, even though it could easily deduce it from the path to QEMU
source tree.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py
index f7b06a7716..13f62780e6 100755
--- a/src/cpu_map/sync_qemu_models_i386.py
+++ b/src/cpu_map/sync_qemu_models_i386.py
@@ -502,8 +502,8 @@ def main():
     parser = argparse.ArgumentParser(
         description="Synchronize x86 cpu models from QEMU i386 target.")
     parser.add_argument(
-        "cpufile",
-        help="Path to 'target/i386/cpu.c' file in the QEMU repository",
+        "qemu",
+        help="Path to QEMU source code",
         type=os.path.realpath)
     parser.add_argument(
         "outdir",
@@ -512,7 +512,12 @@ def main():
 
     args = parser.parse_args()
 
-    builtin_x86_defs = read_builtin_x86_defs(args.cpufile)
+    cpufile = os.path.join(args.qemu, 'target/i386/cpu.c')
+    if not os.path.isfile(cpufile):
+        parser.print_help()
+        exit("QEMU source directory not found")
+
+    builtin_x86_defs = read_builtin_x86_defs(cpufile)
 
     ast = lark.Lark(r"""
         list: value ( "," value )* ","?