[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] simpletrace: correctly detect pointers to strin
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PATCH] simpletrace: correctly detect pointers to strings |
Date: |
Mon, 31 Oct 2016 21:36:01 +0800 |
User-agent: |
Mutt/1.7.1 (2016-10-04) |
On Mon, 10/31 14:25, Paolo Bonzini wrote:
> The visit_type_str tracepoint takes a char**, and the simpletrace backend
> incorrectly treats that as a string. The resulting compiler warning breaks
> --enable-trace-backend=simple builds (including the mingw docker target).
> Fix it by rejecting pointers to pointers to char; rewrite the detection
> as a regular expression for simplicity.
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
> scripts/tracetool/backend/simple.py | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/scripts/tracetool/backend/simple.py
> b/scripts/tracetool/backend/simple.py
> index 9885e83..9dae646 100644
> --- a/scripts/tracetool/backend/simple.py
> +++ b/scripts/tracetool/backend/simple.py
> @@ -14,17 +14,15 @@ __email__ = "address@hidden"
>
>
> from tracetool import out
> +import re
>
>
> PUBLIC = True
> +STRTYPE_RE = re.compile(r'\s*(?:const )?char\s*\*(?!\s*\*)')
>
>
> def is_string(arg):
> - strtype = ('const char*', 'char*', 'const char *', 'char *')
> - if arg.lstrip().startswith(strtype):
> - return True
> - else:
> - return False
> + return not (STRTYPE_RE.match(arg) is None)
>
>
> def generate_h_begin(events, group):
> --
> 1.8.3.1
>
>
There is already:
commit db4df20de86c6e8ecd6c9f042c029ffb9f9cddac
Author: Fam Zheng <address@hidden>
Date: Wed Oct 26 11:50:06 2016 +0800
trace: Fix 'char **' compilation error in simple backend
Currently, the generated function body will do "strlen(arg)" but the
argument could be 'char **' or 'char * const *'. Avoid that by excluding
such cases in is_string check.
Reported by patchew's "make address@hidden".
Suggested-by: Eric Blake <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>