From patchwork Tue Jan 26 18:17:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 8125821 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E0AD79F6DA for ; Tue, 26 Jan 2016 18:23:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F2618202AE for ; Tue, 26 Jan 2016 18:23:42 +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 DA4DC2028D for ; Tue, 26 Jan 2016 18:23:41 +0000 (UTC) Received: from localhost ([::1]:45893 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO8HF-0000D9-6i for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Jan 2016 13:23:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO8BW-0006WV-PA for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO8BT-0007eB-9N for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:46 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:59658) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO8BS-0007bp-S8 for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:43 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1aO8BH-0000EY-QK; Tue, 26 Jan 2016 18:17:31 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 26 Jan 2016 18:17:20 +0000 Message-Id: <1453832250-766-28-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 27/37] sh4: 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 --- disas/sh4.c | 2 +- hw/sh4/r2d.c | 1 + hw/sh4/sh7750.c | 2 +- hw/sh4/sh7750_regnames.c | 1 + hw/sh4/sh_pci.c | 1 + hw/sh4/shix.c | 1 + target-sh4/cpu.c | 1 + target-sh4/gdbstub.c | 2 +- target-sh4/helper.c | 6 +----- target-sh4/monitor.c | 1 + target-sh4/op_helper.c | 2 +- target-sh4/translate.c | 1 + 12 files changed, 12 insertions(+), 9 deletions(-) diff --git a/disas/sh4.c b/disas/sh4.c index 020f5eb..8b0415d 100644 --- a/disas/sh4.c +++ b/disas/sh4.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . */ -#include +#include "qemu/osdep.h" #include "disas/bfd.h" #define DEFINE_TABLE diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index c1ff9a0..7d9a1cd 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -23,6 +23,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/hw.h" #include "hw/sh4/sh.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 5dda5de..a1ea760 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sh4/sh.h" #include "sysemu/sysemu.h" diff --git a/hw/sh4/sh7750_regnames.c b/hw/sh4/sh7750_regnames.c index 52ac1cc..34b4f99 100644 --- a/hw/sh4/sh7750_regnames.c +++ b/hw/sh4/sh7750_regnames.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sh4/sh.h" #include "sh7750_regs.h" diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c index 4509053..e820a32 100644 --- a/hw/sh4/sh_pci.c +++ b/hw/sh4/sh_pci.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/sh4/sh.h" #include "hw/pci/pci.h" diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c index d508be9..386a485 100644 --- a/hw/sh4/shix.c +++ b/hw/sh4/shix.c @@ -27,6 +27,7 @@ More information in target-sh4/README.sh4 */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sh4/sh.h" #include "sysemu/sysemu.h" diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c index d7e2fbd..8621d70 100644 --- a/target-sh4/cpu.c +++ b/target-sh4/cpu.c @@ -19,6 +19,7 @@ * */ +#include "qemu/osdep.h" #include "cpu.h" #include "qemu-common.h" #include "migration/vmstate.h" diff --git a/target-sh4/gdbstub.c b/target-sh4/gdbstub.c index a365a27..1b59ea8 100644 --- a/target-sh4/gdbstub.c +++ b/target-sh4/gdbstub.c @@ -17,7 +17,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 "qemu-common.h" #include "exec/gdbstub.h" diff --git a/target-sh4/helper.c b/target-sh4/helper.c index eaececd..9d8b61c 100644 --- a/target-sh4/helper.c +++ b/target-sh4/helper.c @@ -16,11 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include "cpu.h" diff --git a/target-sh4/monitor.c b/target-sh4/monitor.c index a06f0d4..426e5d4 100644 --- a/target-sh4/monitor.c +++ b/target-sh4/monitor.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "cpu.h" #include "monitor/monitor.h" #include "monitor/hmp-target.h" diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c index a312118..368e687 100644 --- a/target-sh4/op_helper.c +++ b/target-sh4/op_helper.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 +#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" #include "exec/cpu_ldst.h" diff --git a/target-sh4/translate.c b/target-sh4/translate.c index 7bc6216..9de5659 100644 --- a/target-sh4/translate.c +++ b/target-sh4/translate.c @@ -19,6 +19,7 @@ #define DEBUG_DISAS +#include "qemu/osdep.h" #include "cpu.h" #include "disas/disas.h" #include "tcg-op.h"