From 99672c7167cdee40e7d81e3c8b691b19ae408816 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 4 Oct 2016 14:35:46 +0100 Subject: [PATCH] trace: remove duplicate control.h includes in generated-tracers.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Reviewed-by: Stefan Hajnoczi Reviewed-by: LluĂ­s Vilanova Signed-off-by: Daniel P. Berrange Message-id: 1475588159-30598-8-git-send-email-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- 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 80dcf30478a4..4b83b44f3cda 100644 --- a/scripts/tracetool/backend/ftrace.py +++ b/scripts/tracetool/backend/ftrace.py @@ -21,7 +21,6 @@ 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 b3ff0640118c..426bb6e2a257 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -20,8 +20,7 @@ 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 89019bc75924..5f693bdf4df5 100644 --- a/scripts/tracetool/backend/syslog.py +++ b/scripts/tracetool/backend/syslog.py @@ -21,7 +21,6 @@ def generate_h_begin(events): out('#include ', - '#include "trace/control.h"', '')