From: Tim Wiederhake <twiederh@redhat.com>
Date: Mon, 7 Jun 2021 12:01:24 +0000 (+0200)
Subject: cpu_map: sync_qemu_i386.py: Allow begin mark to contain `const`
X-Git-Tag: v7.5.0-rc1~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1f30793b21d06715671614a8118c368ad4ddfb8;p=thirdparty%2Flibvirt.git

cpu_map: sync_qemu_i386.py: Allow begin mark to contain `const`

This was introduced in qemu commit
e11fd68996fb27c040552320f01a7d30a15a7cc1.

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 40c7d6e969..fbf1edf5d0 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 = re.compile("^static X86CPUDefinition builtin_x86_defs\\[\\] = {$")
+    begin_mark = re.compile("^static( const)? X86CPUDefinition builtin_x86_defs\\[\\] = {$")
     end_mark = "};\n"
     shorthand = re.compile("^#define ([A-Z0-9_]+_FEATURES) (.*)$")
     lines = list()