From patchwork Fri Dec 6 19:15:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 298214 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7599C2C00A8 for ; Sat, 7 Dec 2013 06:18:05 +1100 (EST) Received: from localhost ([::1]:33051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vp0uY-0007Kd-UO for incoming@patchwork.ozlabs.org; Fri, 06 Dec 2013 14:18:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vp0sS-0003wo-Ud for qemu-devel@nongnu.org; Fri, 06 Dec 2013 14:15:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vp0sL-00068E-Vo for qemu-devel@nongnu.org; Fri, 06 Dec 2013 14:15:52 -0500 Received: from isrv.corpit.ru ([86.62.121.231]:56474) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vp0sL-00067b-09; Fri, 06 Dec 2013 14:15:45 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 5B56A40DD0; Fri, 6 Dec 2013 23:15:44 +0400 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id 3E7B652D; Fri, 6 Dec 2013 23:15:44 +0400 (MSK) Received: (nullmailer pid 19209 invoked by uid 1000); Fri, 06 Dec 2013 19:15:43 -0000 From: Michael Tokarev To: aliguori@amazon.com Date: Fri, 6 Dec 2013 23:15:28 +0400 Message-Id: <1386357341-19147-2-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1386357341-19147-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1386357341-19147-1-git-send-email-mjt@msgid.tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Stefan Weil , Michael Tokarev , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 01/14] trace: Remove trace.h from console.h (less dependencies) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Stefan Weil This reduces the dependencies on trace.h. Only two source files which need console.h also need trace.h. Signed-off-by: Stefan Weil Signed-off-by: Michael Tokarev --- hw/display/vmware_vga.c | 1 + include/ui/console.h | 1 - ui/console.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index a6a8cdc..aba292c 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -23,6 +23,7 @@ */ #include "hw/hw.h" #include "hw/loader.h" +#include "trace.h" #include "ui/console.h" #include "hw/pci/pci.h" diff --git a/include/ui/console.h b/include/ui/console.h index 98edf41..4156a87 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -6,7 +6,6 @@ #include "qapi/qmp/qdict.h" #include "qemu/notify.h" #include "monitor/monitor.h" -#include "trace.h" #include "qapi-types.h" #include "qapi/error.h" diff --git a/ui/console.c b/ui/console.c index 199ba69..61ed219 100644 --- a/ui/console.c +++ b/ui/console.c @@ -27,6 +27,7 @@ #include "qemu/timer.h" #include "qmp-commands.h" #include "sysemu/char.h" +#include "trace.h" //#define DEBUG_CONSOLE #define DEFAULT_BACKSCROLL 512