From patchwork Tue Jan 26 18:17:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 8126311 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 58F2BBEEE5 for ; Tue, 26 Jan 2016 18:38:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1DD4C202E5 for ; Tue, 26 Jan 2016 18:37:59 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id A97FE20266 for ; Tue, 26 Jan 2016 18:37:57 +0000 (UTC) Received: from localhost ([::1]:46073 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO8V3-0000ix-4G for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Jan 2016 13:37:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO8Ba-0006dT-IJ for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO8BU-0007gA-E1 for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:50 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:59658) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO8BU-0007bp-19 for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:44 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1aO8BH-0000DO-4E; Tue, 26 Jan 2016 18:17:31 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 26 Jan 2016 18:17:02 +0000 Message-Id: <1453832250-766-10-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 09/37] linux-user: 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- linux-user/arm/nwfpe/double_cpdo.c | 1 + linux-user/arm/nwfpe/extended_cpdo.c | 1 + linux-user/arm/nwfpe/fpa11.c | 2 +- linux-user/arm/nwfpe/fpa11_cpdo.c | 1 + linux-user/arm/nwfpe/fpa11_cpdt.c | 1 + linux-user/arm/nwfpe/fpa11_cprt.c | 1 + linux-user/arm/nwfpe/fpopcode.c | 1 + linux-user/arm/nwfpe/single_cpdo.c | 1 + linux-user/elfload.c | 10 +--------- linux-user/flatload.c | 5 +---- linux-user/linuxload.c | 8 +------- linux-user/m68k-sim.c | 9 +-------- linux-user/main.c | 7 +------ linux-user/mmap.c | 9 +-------- linux-user/signal.c | 7 +------ linux-user/strace.c | 4 +--- linux-user/syscall.c | 14 +------------- linux-user/uaccess.c | 3 +-- linux-user/uname.c | 2 +- linux-user/vm86.c | 7 +------ 20 files changed, 20 insertions(+), 74 deletions(-) diff --git a/linux-user/arm/nwfpe/double_cpdo.c b/linux-user/arm/nwfpe/double_cpdo.c index 41c28f3..1cef380 100644 --- a/linux-user/arm/nwfpe/double_cpdo.c +++ b/linux-user/arm/nwfpe/double_cpdo.c @@ -18,6 +18,7 @@ along with this program; if not, see . */ +#include "qemu/osdep.h" #include "fpa11.h" #include "fpu/softfloat.h" #include "fpopcode.h" diff --git a/linux-user/arm/nwfpe/extended_cpdo.c b/linux-user/arm/nwfpe/extended_cpdo.c index 48eca3b..1c8a412 100644 --- a/linux-user/arm/nwfpe/extended_cpdo.c +++ b/linux-user/arm/nwfpe/extended_cpdo.c @@ -18,6 +18,7 @@ along with this program; if not, see . */ +#include "qemu/osdep.h" #include "fpa11.h" #include "fpu/softfloat.h" #include "fpopcode.h" diff --git a/linux-user/arm/nwfpe/fpa11.c b/linux-user/arm/nwfpe/fpa11.c index eebd93f..441e3b1 100644 --- a/linux-user/arm/nwfpe/fpa11.c +++ b/linux-user/arm/nwfpe/fpa11.c @@ -18,6 +18,7 @@ along with this program; if not, see . */ +#include "qemu/osdep.h" #include "fpa11.h" #include "fpopcode.h" @@ -27,7 +28,6 @@ //#include -#include FPA11* qemufpa = NULL; CPUARMState* user_registers; diff --git a/linux-user/arm/nwfpe/fpa11_cpdo.c b/linux-user/arm/nwfpe/fpa11_cpdo.c index 5f4a6a4..94ac98a 100644 --- a/linux-user/arm/nwfpe/fpa11_cpdo.c +++ b/linux-user/arm/nwfpe/fpa11_cpdo.c @@ -18,6 +18,7 @@ along with this program; if not, see . */ +#include "qemu/osdep.h" #include "fpa11.h" #include "fpopcode.h" diff --git a/linux-user/arm/nwfpe/fpa11_cpdt.c b/linux-user/arm/nwfpe/fpa11_cpdt.c index 007a3d6..c32b0c2 100644 --- a/linux-user/arm/nwfpe/fpa11_cpdt.c +++ b/linux-user/arm/nwfpe/fpa11_cpdt.c @@ -19,6 +19,7 @@ along with this program; if not, see . */ +#include "qemu/osdep.h" #include "fpa11.h" #include "fpu/softfloat.h" #include "fpopcode.h" diff --git a/linux-user/arm/nwfpe/fpa11_cprt.c b/linux-user/arm/nwfpe/fpa11_cprt.c index 7be93fa..04dc2eb 100644 --- a/linux-user/arm/nwfpe/fpa11_cprt.c +++ b/linux-user/arm/nwfpe/fpa11_cprt.c @@ -19,6 +19,7 @@ along with this program; if not, see . */ +#include "qemu/osdep.h" #include "fpa11.h" #include "fpu/softfloat.h" #include "fpopcode.h" diff --git a/linux-user/arm/nwfpe/fpopcode.c b/linux-user/arm/nwfpe/fpopcode.c index 0ada30c..6784256 100644 --- a/linux-user/arm/nwfpe/fpopcode.c +++ b/linux-user/arm/nwfpe/fpopcode.c @@ -18,6 +18,7 @@ along with this program; if not, see . */ +#include "qemu/osdep.h" #include "fpa11.h" #include "fpu/softfloat.h" #include "fpopcode.h" diff --git a/linux-user/arm/nwfpe/single_cpdo.c b/linux-user/arm/nwfpe/single_cpdo.c index 2bfb359..21e177b 100644 --- a/linux-user/arm/nwfpe/single_cpdo.c +++ b/linux-user/arm/nwfpe/single_cpdo.c @@ -18,6 +18,7 @@ along with this program; if not, see . */ +#include "qemu/osdep.h" #include "fpa11.h" #include "fpu/softfloat.h" #include "fpopcode.h" diff --git a/linux-user/elfload.c b/linux-user/elfload.c index b90be12..19dc7f5 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1,17 +1,9 @@ /* This is the Linux kernel elf-loading code, ported into user space */ -#include +#include "qemu/osdep.h" #include -#include -#include -#include -#include -#include #include #include -#include -#include -#include #include "qemu.h" #include "disas/disas.h" diff --git a/linux-user/flatload.c b/linux-user/flatload.c index ceacb98..a25c797 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -33,11 +33,8 @@ /****************************************************************************/ -#include -#include -#include +#include "qemu/osdep.h" #include -#include #include "qemu.h" #include "flat.h" diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c index dbaf0ec..6f0d605 100644 --- a/linux-user/linuxload.c +++ b/linux-user/linuxload.c @@ -1,12 +1,6 @@ /* Code for loading Linux executables. Mostly linux kernel code. */ -#include -#include -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include "qemu.h" diff --git a/linux-user/m68k-sim.c b/linux-user/m68k-sim.c index 1994e40..34d332d 100644 --- a/linux-user/m68k-sim.c +++ b/linux-user/m68k-sim.c @@ -17,14 +17,7 @@ * along with this program; if not, see . */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include "qemu.h" diff --git a/linux-user/main.c b/linux-user/main.c index ee12035..f8d4577 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -16,12 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ -#include -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include #include #include diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 445e8c6..3519147 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -16,14 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include #include #include diff --git a/linux-user/signal.c b/linux-user/signal.c index d4d83f2..327c032 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -16,12 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ -#include -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include #include diff --git a/linux-user/strace.c b/linux-user/strace.c index ea6c1d2..0810c85 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -1,13 +1,11 @@ -#include +#include "qemu/osdep.h" #include #include #include #include #include -#include #include #include -#include #include #include "qemu.h" diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 0cbace4..54ce14a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -17,24 +17,13 @@ * along with this program; if not, see . */ #define _ATFILE_SOURCE -#include -#include -#include -#include +#include "qemu/osdep.h" #include #include -#include -#include -#include -#include -#include #include -#include #include #include #include -#include -#include #include #include #include @@ -44,7 +33,6 @@ #include #include #include -#include #include #ifdef __ia64__ int __clone2(int (*fn)(void *), void *child_stack_base, diff --git a/linux-user/uaccess.c b/linux-user/uaccess.c index a4d108c..75d890d 100644 --- a/linux-user/uaccess.c +++ b/linux-user/uaccess.c @@ -1,6 +1,5 @@ /* User memory access */ -#include -#include +#include "qemu/osdep.h" #include "qemu.h" diff --git a/linux-user/uname.c b/linux-user/uname.c index 1e6560d..313b79d 100644 --- a/linux-user/uname.c +++ b/linux-user/uname.c @@ -17,7 +17,7 @@ * along with this program; if not, see . */ -#include +#include "qemu/osdep.h" #include "qemu.h" //#include "qemu-common.h" diff --git a/linux-user/vm86.c b/linux-user/vm86.c index 22a4eb9..3829b9a 100644 --- a/linux-user/vm86.c +++ b/linux-user/vm86.c @@ -16,12 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ -#include -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include "qemu.h"