[libvirt PATCH 2/2] cpu_map: sync_qemu_i386.py: Allow begin mark to contain `const`

Tim Wiederhake twiederh at redhat.com
Mon Jun 7 12:01:24 UTC 2021


This was introduced in qemu commit e11fd68996fb27c040552320f01a7d30a15a7cc1.

Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
---
 src/cpu_map/sync_qemu_i386.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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()
-- 
2.26.3




More information about the libvir-list mailing list