Re: [Qemu-devel] [PATCH v3 05/18] trace: remove duplicate control.h includes in generated-tracers.h

[Lluís Vilanova]

Daniel P Berrange writes:

> The format/h.py file adds an include for control.h to
> generated-tracers.h. ftrace, log and syslog, then
> add more duplicate includes for control.h.

> Signed-off-by: Daniel P. Berrange 

Reviewed-by: Lluís Vilanova 


> ---
>  scripts/tracetool/backend/ftrace.py | 1 -
>  scripts/tracetool/backend/log.py| 3 +--
>  scripts/tracetool/backend/syslog.py | 1 -
>  3 files changed, 1 insertion(+), 4 deletions(-)

> diff --git a/scripts/tracetool/backend/ftrace.py 
> b/scripts/tracetool/backend/ftrace.py
> index 80dcf30..4b83b44 100644
> --- a/scripts/tracetool/backend/ftrace.py
> +++ b/scripts/tracetool/backend/ftrace.py
> @@ -21,7 +21,6 @@ PUBLIC = True
 
>  def generate_h_begin(events):
>  out('#include "trace/ftrace.h"',
> -'#include "trace/control.h"',
>  '')
 
 
> diff --git a/scripts/tracetool/backend/log.py 
> b/scripts/tracetool/backend/log.py
> index b3ff064..426bb6e 100644
> --- a/scripts/tracetool/backend/log.py
> +++ b/scripts/tracetool/backend/log.py
> @@ -20,8 +20,7 @@ PUBLIC = True
 
 
>  def generate_h_begin(events):
> -out('#include "trace/control.h"',
> -'#include "qemu/log.h"',
> +out('#include "qemu/log.h"',
>  '')
 
 
> diff --git a/scripts/tracetool/backend/syslog.py 
> b/scripts/tracetool/backend/syslog.py
> index 89019bc..5f693bd 100644
> --- a/scripts/tracetool/backend/syslog.py
> +++ b/scripts/tracetool/backend/syslog.py
> @@ -21,7 +21,6 @@ PUBLIC = True
 
>  def generate_h_begin(events):
>  out('#include ',
> -'#include "trace/control.h"',
>  '')
 
 
> -- 
> 2.7.4

[Qemu-devel] [PATCH v3 05/18] trace: remove duplicate control.h includes in generated-tracers.h

[Daniel P. Berrange]

The format/h.py file adds an include for control.h to
generated-tracers.h. ftrace, log and syslog, then
add more duplicate includes for control.h.

Signed-off-by: Daniel P. Berrange 
---
 scripts/tracetool/backend/ftrace.py | 1 -
 scripts/tracetool/backend/log.py| 3 +--
 scripts/tracetool/backend/syslog.py | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/tracetool/backend/ftrace.py 
b/scripts/tracetool/backend/ftrace.py
index 80dcf30..4b83b44 100644
--- a/scripts/tracetool/backend/ftrace.py
+++ b/scripts/tracetool/backend/ftrace.py
@@ -21,7 +21,6 @@ PUBLIC = True
 
 def generate_h_begin(events):
 out('#include "trace/ftrace.h"',
-'#include "trace/control.h"',
 '')
 
 
diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py
index b3ff064..426bb6e 100644
--- a/scripts/tracetool/backend/log.py
+++ b/scripts/tracetool/backend/log.py
@@ -20,8 +20,7 @@ PUBLIC = True
 
 
 def generate_h_begin(events):
-out('#include "trace/control.h"',
-'#include "qemu/log.h"',
+out('#include "qemu/log.h"',
 '')
 
 
diff --git a/scripts/tracetool/backend/syslog.py 
b/scripts/tracetool/backend/syslog.py
index 89019bc..5f693bd 100644
--- a/scripts/tracetool/backend/syslog.py
+++ b/scripts/tracetool/backend/syslog.py
@@ -21,7 +21,6 @@ PUBLIC = True
 
 def generate_h_begin(events):
 out('#include ',
-'#include "trace/control.h"',
 '')
 
 
-- 
2.7.4