From patchwork Tue Jan 26 18:16:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 60522 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp2126493lbb; Tue, 26 Jan 2016 10:18:35 -0800 (PST) X-Received: by 10.55.82.2 with SMTP id g2mr5761977qkb.53.1453832315121; Tue, 26 Jan 2016 10:18:35 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p190si2530580qha.63.2016.01.26.10.18.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 26 Jan 2016 10:18:35 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:45840 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO8CI-00074s-Gv for patch@linaro.org; Tue, 26 Jan 2016 13:18:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO8BK-0006FF-Qj for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO8BJ-0007Ua-D9 for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:34 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:59628) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO8BJ-0007UI-4g for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:33 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1aO8BG-0000D0-Sl; Tue, 26 Jan 2016 18:17:30 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 26 Jan 2016 18:16:56 +0000 Message-Id: <1453832250-766-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1453832250-766-1-git-send-email-peter.maydell@linaro.org> References: <1453832250-766-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:8b0:1d0::1 Cc: patches@linaro.org Subject: [Qemu-devel] [PATCH 03/37] exec: Clean up includes 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes. Signed-off-by: Peter Maydell --- cpu-exec-common.c | 2 +- cpu-exec.c | 2 +- cpus.c | 2 +- cputlb.c | 2 +- exec.c | 4 +--- translate-all.c | 9 +-------- translate-common.c | 1 + 7 files changed, 7 insertions(+), 15 deletions(-) -- 1.9.1 diff --git a/cpu-exec-common.c b/cpu-exec-common.c index 43edf36..1b1731c 100644 --- a/cpu-exec-common.c +++ b/cpu-exec-common.c @@ -17,7 +17,7 @@ * License along with this library; if not, see . */ -#include "config.h" +#include "qemu/osdep.h" #include "cpu.h" #include "sysemu/cpus.h" #include "exec/memory-internal.h" diff --git a/cpu-exec.c b/cpu-exec.c index c88d0ff..c459364 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#include "config.h" +#include "qemu/osdep.h" #include "cpu.h" #include "trace.h" #include "disas/disas.h" diff --git a/cpus.c b/cpus.c index 3efff6b..d42e8ed 100644 --- a/cpus.c +++ b/cpus.c @@ -23,7 +23,7 @@ */ /* Needed early for CONFIG_BSD etc. */ -#include "config-host.h" +#include "qemu/osdep.h" #include "monitor/monitor.h" #include "qapi/qmp/qerror.h" diff --git a/cputlb.c b/cputlb.c index f6fb161..3973030 100644 --- a/cputlb.c +++ b/cputlb.c @@ -17,7 +17,7 @@ * License along with this library; if not, see . */ -#include "config.h" +#include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" #include "exec/memory.h" diff --git a/exec.c b/exec.c index 7115403..9e076bc 100644 --- a/exec.c +++ b/exec.c @@ -16,9 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#include "config.h" +#include "qemu/osdep.h" #ifndef _WIN32 -#include #include #endif @@ -30,7 +29,6 @@ #include "hw/boards.h" #endif #include "hw/qdev.h" -#include "qemu/osdep.h" #include "sysemu/kvm.h" #include "sysemu/sysemu.h" #include "hw/xen/xen.h" diff --git a/translate-all.c b/translate-all.c index 042a857..ab61fac 100644 --- a/translate-all.c +++ b/translate-all.c @@ -19,16 +19,10 @@ #ifdef _WIN32 #include #else -#include #include #endif -#include -#include -#include -#include -#include +#include "qemu/osdep.h" -#include "config.h" #include "qemu-common.h" #define NO_CPU_IO_DEFS @@ -43,7 +37,6 @@ #if __FreeBSD_version >= 700104 #define HAVE_KINFO_GETVMMAP #define sigqueue sigqueue_freebsd /* avoid redefinition */ -#include #include #include #define _KERNEL diff --git a/translate-common.c b/translate-common.c index 171222d..ffbfe85 100644 --- a/translate-common.c +++ b/translate-common.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "qom/cpu.h"