[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v3 1/8] x86: fix compat header generation



On 8/31/2020 9:07 AM, Jan Beulich wrote:
unmatched group

I just got to this today.  The following work for me with python 3.4.6, basically add an extra group that is not part of a conditional match:

From 0ee501b7491cf62e18a454dcebc12b1b6d36e9e9 Mon Sep 17 00:00:00 2001
Message-Id: <0ee501b7491cf62e18a454dcebc12b1b6d36e9e9.1599081619.git.don.slutz@xxxxxxxxx>
From: Don Slutz <don.slutz@xxxxxxxxx>
Date: Wed, 2 Sep 2020 17:18:43 -0400
Subject: [PATCH] Add extra group to avoid python bug 3.4.6 about 'unmatched
 group'

Signed-off-by: Don Slutz <don.slutz@xxxxxxxxx>
---
 xen/tools/compat-build-header.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/tools/compat-build-header.py b/xen/tools/compat-build-header.py
index 54c121b..ca706ce 100755
--- a/xen/tools/compat-build-header.py
+++ b/xen/tools/compat-build-header.py
@@ -11,8 +11,8 @@ pats = [
  [ r"__UnDeF__", r"#undef" ],
  [ r"\"xen-compat.h\"", r"<public/xen-compat.h>" ],
  [ r"(struct|union|enum)\s+(xen_?)?(\w)", r"\1 compat_\3" ],
- [ r"typedef(.*)@KeeP@(xen_?)?([\w]+)([^\w])",
-   r"typedef\1\2\3 __attribute__((__aligned__(__alignof(\1compat_\3))))\4" ],
+ [ r"typedef(.*)@KeeP@((xen_?)?)([\w]+)([^\w])",
+   r"typedef\1\2\4 __attribute__((__aligned__(__alignof(\1compat_\4))))\5" ],
  [ r"_t([^\w]|$)", r"_compat_t\1" ],
  [ r"int(8|16|32|64_aligned)_compat_t([^\w]|$)", r"int\1_t\2" ],
  [ r"(\su?int64(_compat)?)_T([^\w]|$)", r"\1_t\3" ],
--
1.8.3.1





 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.