From: Tim Wiederhake <twiederh@redhat.com>
Date: Mon, 7 Jun 2021 12:01:23 +0000 (+0200)
Subject: cpu_map: sync_qemu_i386.py: Use regex to look for begin mark
X-Git-Tag: v7.5.0-rc1~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=360b8eb2d2cb1b6a8c9a78fa2c5be31dd7c74487;p=thirdparty%2Flibvirt.git

cpu_map: sync_qemu_i386.py: Use regex to look for begin mark

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/cpu_map/sync_qemu_i386.py b/src/cpu_map/sync_qemu_i386.py
index 1a98fa70d7..40c7d6e969 100755
--- a/src/cpu_map/sync_qemu_i386.py
+++ b/src/cpu_map/sync_qemu_i386.py
@@ -196,7 +196,7 @@ def read_builtin_x86_defs(filename):
     """Extract content between begin_mark and end_mark from file `filename` as
     string, while expanding shorthand macros like "I486_FEATURES"."""
 
-    begin_mark = "static X86CPUDefinition builtin_x86_defs[] = {\n"
+    begin_mark = re.compile("^static X86CPUDefinition builtin_x86_defs\\[\\] = {$")
     end_mark = "};\n"
     shorthand = re.compile("^#define ([A-Z0-9_]+_FEATURES) (.*)$")
     lines = list()
@@ -205,10 +205,11 @@ def read_builtin_x86_defs(filename):
     with open(filename, "rt") as f:
         while True:
             line = readline_cont(f)
-            if line == begin_mark:
-                break
             if not line:
                 raise RuntimeError("begin mark not found")
+            match = begin_mark.match(line)
+            if match:
+                break;
             match = shorthand.match(line)
             if match:
                 # TCG definitions are irrelevant for cpu models