[{"id":1773756,"web_url":"http://patchwork.ozlabs.org/comment/1773756/","msgid":"","list_archive_url":null,"date":"2017-09-22T16:44:25","subject":"Re: [Qemu-devel] [PATCH 08/34] nios2: remove duplicated includes","submitter":{"id":5111,"url":"http://patchwork.ozlabs.org/api/people/5111/","name":"Peter Maydell","email":"peter.maydell@linaro.org"},"content":"On 22 September 2017 at 16:39, Philippe Mathieu-Daudé wrote:\n> applied using ./scripts/clean-includes\n>\n> Signed-off-by: Philippe Mathieu-Daudé \n> ---\n> target/nios2/cpu.h | 1 -\n> disas/nios2.c | 3 ---\n> hw/nios2/boot.c | 1 -\n> target/nios2/helper.c | 7 ++-----\n> target/nios2/op_helper.c | 1 +\n> target/nios2/translate.c | 1 +\n> 6 files changed, 4 insertions(+), 10 deletions(-)\n>\n> diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h\n> index 50d803a217..fda02c39b9 100644\n> --- a/target/nios2/cpu.h\n> +++ b/target/nios2/cpu.h\n> @@ -20,7 +20,6 @@\n> #ifndef CPU_NIOS2_H\n> #define CPU_NIOS2_H\n>\n> -#include \"qemu/osdep.h\"\n> #include \"qemu-common.h\"\n>\n> #define TARGET_LONG_BITS 32\n> diff --git a/disas/nios2.c b/disas/nios2.c\n> index b342936d21..de11f04cc4 100644\n> --- a/disas/nios2.c\n> +++ b/disas/nios2.c\n> @@ -1756,7 +1756,6 @@ extern const int nios2_num_r2_reg_range_mappings;\n> #endif /* _NIOS2_H */\n>\n> /*#include \"sysdep.h\"\n> -#include \n> #include \"opcode/nios2.h\"\n> */\n> /* Register string table */\n> @@ -2521,8 +2520,6 @@ const int nios2_num_r2_reg_range_mappings = 8;\n> #include \"dis-asm.h\"\n> #include \"opcode/nios2.h\"\n> #include \"libiberty.h\"\n> -#include \n> -#include \n> */\n\nThese are in commented out bits of code anyway, but I guess it doesn't\nhurt and it'll prevent the script complaining later.\n\n> /* No symbol table is available when this code runs out in an embedded\n> system as when it is used for disassembler support in a monitor. */\n> diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c\n> index 2b31f5b844..94f436e7fb 100644\n> --- a/hw/nios2/boot.c\n> +++ b/hw/nios2/boot.c\n> @@ -34,7 +34,6 @@\n> #include \"qemu/option.h\"\n> #include \"qemu/config-file.h\"\n> #include \"qemu/error-report.h\"\n> -#include \"qemu-common.h\"\n> #include \"sysemu/device_tree.h\"\n> #include \"sysemu/sysemu.h\"\n> #include \"hw/loader.h\"\n> diff --git a/target/nios2/helper.c b/target/nios2/helper.c\n> index ef9ee05798..9f741a8f19 100644\n> --- a/target/nios2/helper.c\n> +++ b/target/nios2/helper.c\n> @@ -18,12 +18,9 @@\n> * \n> */\n>\n> -#include \n> -#include \n> -#include \n> -\n> -#include \"cpu.h\"\n> #include \"qemu/osdep.h\"\n> +\n> +#include \"cpu.h\"\n> #include \"qemu/host-utils.h\"\n> #include \"qapi/error.h\"\n> #include \"exec/exec-all.h\"\n> diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c\n> index efb1c489c9..c853aeae02 100644\n> --- a/target/nios2/op_helper.c\n> +++ b/target/nios2/op_helper.c\n> @@ -18,6 +18,7 @@\n> * \n> */\n>\n> +#include \"qemu/osdep.h\"\n> #include \"cpu.h\"\n> #include \"exec/helper-proto.h\"\n> #include \"exec/cpu_ldst.h\"\n> diff --git a/target/nios2/translate.c b/target/nios2/translate.c\n> index 6b0961837d..796d399bd1 100644\n> --- a/target/nios2/translate.c\n> +++ b/target/nios2/translate.c\n> @@ -21,6 +21,7 @@\n> * \n> */\n>\n> +#include \"qemu/osdep.h\"\n> #include \"cpu.h\"\n> #include \"tcg-op.h\"\n> #include \"exec/exec-all.h\"\n\nReviewed-by: Peter Maydell \n\nthanks\n-- PMM","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"aVhFojo+\"; dkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xzK8z2kqQz9s5L\n\tfor ;\n\tSat, 23 Sep 2017 02:45:23 +1000 (AEST)","from localhost ([::1]:60124 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dvR4r-0006er-Gw\n\tfor incoming@patchwork.ozlabs.org; Fri, 22 Sep 2017 12:45:21 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46529)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dvR4K-0006dm-Tw\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:44:50 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dvR4J-0007XU-OB\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:44:48 -0400","from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:47083)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dvR4J-0007Wr-HE\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:44:47 -0400","by mail-wm0-x22e.google.com with SMTP id m72so5524191wmc.1\n\tfor ; Fri, 22 Sep 2017 09:44:47 -0700 (PDT)","by 10.223.139.215 with HTTP; Fri, 22 Sep 2017 09:44:25 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=mime-version:in-reply-to:references:from:date:message-id:subject:to\n\t:cc:content-transfer-encoding;\n\tbh=hR0hmv8lIFmJIboJDWWIGT1gV/ILiQlZ7MsY9BFABII=;\n\tb=aVhFojo+rxtSdwaF+9cOeSkq8TxhDXKVh2Wd/rm7yt/kJJhqV1XGI8CZy1LDx3W4Gr\n\tRZw5BilugvKxk9GwcNdUcqOuL9d8Ftha/+QGjwoJ+FJqQFUTXeNnkkuLmOhCMW88EsJA\n\taKsuTMIvCphicZOXuoCqI5v8OJ9KzevbMZAas=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:in-reply-to:references:from:date\n\t:message-id:subject:to:cc:content-transfer-encoding;\n\tbh=hR0hmv8lIFmJIboJDWWIGT1gV/ILiQlZ7MsY9BFABII=;\n\tb=uLNWK5FVW59NHokmkMFhWDQP0i5GtF8h969m3W1AJkYuFK17j3rezjEKHxW+HZmWO0\n\t6IewV0HbLFGWYhb7KginmZoc2v3mi5Ql9VhTK+TzNn0qzPFgSYQVGYqpDYannIQ0kcWv\n\tPgCNdYrJSXGxixo4H/OETjLcgCDU1wUoFpscj7t3xoF0K9HDa9o+YPJM9GmnwRbbHG9w\n\tGEpS0a8fhd4o8WijskFH+9xXzlAZTxGvZuX2XZ9z57vrHYt3VUYVqD0h61COkVT3LrTX\n\tb2Ot2SSxUPPopVxLWYJy761uyQmTqoefVP7zeL6bXvy/8g4KFn6rP0xw0j92k9WD5xfA\n\tMFqQ==","X-Gm-Message-State":"AHPjjUgfc5//49/r7OfJ6twHha4gS3BfpwOdFEl/8gtQEr9Xs0fPk61d\n\tmIV5BdGTaJykQFcziH1raDqLKVTpS2zO1u6PqXgdpA==","X-Google-Smtp-Source":"AOwi7QCXRrqnwZhG2uZvjUnh/JeAOy/YHuQ6crufuYjPpxb6RCCWluXjjS2VeBgoc5yQH4GLI0akZUIKRpNWHQh+Sp8=","X-Received":"by 10.28.166.135 with SMTP id p129mr4650835wme.147.1506098686358;\n\tFri, 22 Sep 2017 09:44:46 -0700 (PDT)","MIME-Version":"1.0","In-Reply-To":"<20170922154014.29350-9-f4bug@amsat.org>","References":"<20170922154014.29350-1-f4bug@amsat.org>\n\t<20170922154014.29350-9-f4bug@amsat.org>","From":"Peter Maydell ","Date":"Fri, 22 Sep 2017 17:44:25 +0100","Message-ID":"","To":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","Content-Type":"text/plain; charset=\"UTF-8\"","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2a00:1450:400c:c09::22e","Subject":"Re: [Qemu-devel] [PATCH 08/34] nios2: remove duplicated includes","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Marek Vasut , QEMU Trivial ,\n\tThomas Huth , Chris Wulff ,\n\tQEMU Developers ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]