diff mbox

tools: configure correct trace backend for QEMU

Message ID 1462812194-8369-1-git-send-email-paul.durrant@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Paul Durrant May 9, 2016, 4:43 p.m. UTC
Newer versions of the QEMU source have replaced the 'stderr' trace
backend with 'log'. This patch adjusts the tools Makefile to test for
the 'log' backend and specify it if it is available.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
 tools/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Wei Liu May 10, 2016, 10:57 a.m. UTC | #1
On Mon, May 09, 2016 at 05:43:14PM +0100, Paul Durrant wrote:
> Newer versions of the QEMU source have replaced the 'stderr' trace
> backend with 'log'. This patch adjusts the tools Makefile to test for
> the 'log' backend and specify it if it is available.
> 
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

Acked-by: Wei Liu <wei.liu2@citrix.com>

I have queued this up for committing for 4.7

Wei.

> ---
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
> ---
>  tools/Makefile | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/Makefile b/tools/Makefile
> index 3f45fb9..6440dec 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -240,7 +240,9 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
>  		source=.; \
>  	fi; \
>  	cd qemu-xen-dir; \
> -	if $$source/scripts/tracetool.py --check-backend --backend stderr ; then \
> +	if $$source/scripts/tracetool.py --check-backend --backend log ; then \
> +		enable_trace_backend='--enable-trace-backend=log'; \
> +	elif $$source/scripts/tracetool.py --check-backend --backend stderr ; then \
>  		enable_trace_backend='--enable-trace-backend=stderr'; \
>  	else \
>  		enable_trace_backend='' ; \
> -- 
> 2.1.4
>
Paul Durrant May 10, 2016, 12:38 p.m. UTC | #2
> -----Original Message-----
> From: Wei Liu [mailto:wei.liu2@citrix.com]
> Sent: 10 May 2016 11:58
> To: Paul Durrant
> Cc: xen-devel@lists.xenproject.org; Ian Jackson; Wei Liu
> Subject: Re: [PATCH] tools: configure correct trace backend for QEMU
> 
> On Mon, May 09, 2016 at 05:43:14PM +0100, Paul Durrant wrote:
> > Newer versions of the QEMU source have replaced the 'stderr' trace
> > backend with 'log'. This patch adjusts the tools Makefile to test for
> > the 'log' backend and specify it if it is available.
> >
> > Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> 
> Acked-by: Wei Liu <wei.liu2@citrix.com>
> 
> I have queued this up for committing for 4.7
> 

Cool. Thanks :-)

  Paul

> Wei.
> 
> > ---
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > Cc: Wei Liu <wei.liu2@citrix.com>
> > ---
> >  tools/Makefile | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/Makefile b/tools/Makefile
> > index 3f45fb9..6440dec 100644
> > --- a/tools/Makefile
> > +++ b/tools/Makefile
> > @@ -240,7 +240,9 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
> >  		source=.; \
> >  	fi; \
> >  	cd qemu-xen-dir; \
> > -	if $$source/scripts/tracetool.py --check-backend --backend stderr ;
> then \
> > +	if $$source/scripts/tracetool.py --check-backend --backend log ; then
> \
> > +		enable_trace_backend='--enable-trace-backend=log'; \
> > +	elif $$source/scripts/tracetool.py --check-backend --backend stderr ;
> then \
> >  		enable_trace_backend='--enable-trace-backend=stderr'; \
> >  	else \
> >  		enable_trace_backend='' ; \
> > --
> > 2.1.4
> >
diff mbox

Patch

diff --git a/tools/Makefile b/tools/Makefile
index 3f45fb9..6440dec 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -240,7 +240,9 @@  subdir-all-qemu-xen-dir: qemu-xen-dir-find
 		source=.; \
 	fi; \
 	cd qemu-xen-dir; \
-	if $$source/scripts/tracetool.py --check-backend --backend stderr ; then \
+	if $$source/scripts/tracetool.py --check-backend --backend log ; then \
+		enable_trace_backend='--enable-trace-backend=log'; \
+	elif $$source/scripts/tracetool.py --check-backend --backend stderr ; then \
 		enable_trace_backend='--enable-trace-backend=stderr'; \
 	else \
 		enable_trace_backend='' ; \