[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 36/61] nios2: remove duplicated includes (in code c
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 36/61] nios2: remove duplicated includes (in code commented out) |
Date: |
Mon, 18 Dec 2017 00:27:41 +0300 |
From: Philippe Mathieu-Daudé <address@hidden>
applied using ./scripts/clean-includes
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
---
disas/nios2.c | 3 ---
hw/nios2/boot.c | 1 -
target/nios2/cpu.h | 1 -
target/nios2/helper.c | 5 +----
target/nios2/op_helper.c | 1 +
target/nios2/translate.c | 1 +
6 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/disas/nios2.c b/disas/nios2.c
index b342936d21..de11f04cc4 100644
--- a/disas/nios2.c
+++ b/disas/nios2.c
@@ -1756,7 +1756,6 @@ extern const int nios2_num_r2_reg_range_mappings;
#endif /* _NIOS2_H */
/*#include "sysdep.h"
-#include <stdio.h>
#include "opcode/nios2.h"
*/
/* Register string table */
@@ -2521,8 +2520,6 @@ const int nios2_num_r2_reg_range_mappings = 8;
#include "dis-asm.h"
#include "opcode/nios2.h"
#include "libiberty.h"
-#include <string.h>
-#include <assert.h>
*/
/* No symbol table is available when this code runs out in an embedded
system as when it is used for disassembler support in a monitor. */
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
index 2b31f5b844..94f436e7fb 100644
--- a/hw/nios2/boot.c
+++ b/hw/nios2/boot.c
@@ -34,7 +34,6 @@
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
-#include "qemu-common.h"
#include "sysemu/device_tree.h"
#include "sysemu/sysemu.h"
#include "hw/loader.h"
diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h
index 9119eee587..88823a6d4d 100644
--- a/target/nios2/cpu.h
+++ b/target/nios2/cpu.h
@@ -20,7 +20,6 @@
#ifndef CPU_NIOS2_H
#define CPU_NIOS2_H
-#include "qemu/osdep.h"
#include "qemu-common.h"
#define TARGET_LONG_BITS 32
diff --git a/target/nios2/helper.c b/target/nios2/helper.c
index ef9ee05798..9f741a8f19 100644
--- a/target/nios2/helper.c
+++ b/target/nios2/helper.c
@@ -18,12 +18,9 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
+#include "qemu/osdep.h"
#include "cpu.h"
-#include "qemu/osdep.h"
#include "qemu/host-utils.h"
#include "qapi/error.h"
#include "exec/exec-all.h"
diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c
index efb1c489c9..c853aeae02 100644
--- a/target/nios2/op_helper.c
+++ b/target/nios2/op_helper.c
@@ -18,6 +18,7 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 72329002ac..51a54ff760 100644
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -21,6 +21,7 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "tcg-op.h"
#include "exec/exec-all.h"
--
2.11.0
- [Qemu-trivial] [PULL 55/61] hw/display/vga: "vga_int.h" requires "ui/console.h", (continued)
- [Qemu-trivial] [PULL 55/61] hw/display/vga: "vga_int.h" requires "ui/console.h", Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 52/61] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 15/61] MAINTAINERS: add "hw/registerfields.h" in Register API entry, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 01/61] Remove empty statements, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 13/61] accel/tcg/cpu-exec-common.c: Remove unnecessary include of memory-internal.h, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 07/61] mmap(2) returns MAP_FAILED, not NULL, on failure, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 02/61] hw/alpha/typhoon: simplify using the "unimplemented" sysbus device, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 47/61] hw/tpm: remove old i386 dependency, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 04/61] translate-all: fix 'consisits' typo in comment, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 40/61] hw/misc/pvpanic: remove unused #include, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 36/61] nios2: remove duplicated includes (in code commented out),
Michael Tokarev <=
- [Qemu-trivial] [PULL 08/61] .gitignore: remove vscclient, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 34/61] i386/hax: remove duplicated includes, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 41/61] hw/ssi/aspeed_smc: remove unused #include, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 23/61] MAINTAINERS: add an entry for the i82378 (superio), Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 10/61] Document pretty parameter for mon option, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 35/61] i386/hax: remove duplicated include, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 33/61] ppc: remove duplicated includes, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 06/61] configure: check $CC available before verifying host CPU, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL v2 00/61] Trivial patches for 2017-12-18, Michael Tokarev, 2017/12/17