From patchwork Fri Oct 7 10:09:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 9365963 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B8BC6600C8 for ; Fri, 7 Oct 2016 10:19:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8926294BD for ; Fri, 7 Oct 2016 10:19:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D052294B6; Fri, 7 Oct 2016 10:19:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 116B0294B6 for ; Fri, 7 Oct 2016 10:19:17 +0000 (UTC) Received: from localhost ([::1]:33678 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bsSFH-0002mG-W9 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 07 Oct 2016 06:19:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bsS6L-0003uu-T2 for qemu-devel@nongnu.org; Fri, 07 Oct 2016 06:10:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bsS6J-0004UB-Fv for qemu-devel@nongnu.org; Fri, 07 Oct 2016 06:10:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bsS6J-0004U0-96 for qemu-devel@nongnu.org; Fri, 07 Oct 2016 06:09:59 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BB3D2C00B71D; Fri, 7 Oct 2016 10:09:58 +0000 (UTC) Received: from localhost (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u97A9voq006556; Fri, 7 Oct 2016 06:09:58 -0400 From: Stefan Hajnoczi To: Date: Fri, 7 Oct 2016 11:09:25 +0100 Message-Id: <1475834979-4980-7-git-send-email-stefanha@redhat.com> In-Reply-To: <1475834979-4980-1-git-send-email-stefanha@redhat.com> References: <1475834979-4980-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 07 Oct 2016 10:09:58 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 06/20] trace: remove duplicate control.h includes in generated-tracers.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "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. 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 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"', '')