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, with the change
to target/s390x/gen-features.c manually reverted, and blank lines
around deletions collapsed.
Signed-off-by: Markus Armbruster <address@hidden>
---
block/parallels.h | 1 -
hw/block/vhost-user-blk.c | 1 -
hw/ide/sii3112.c | 1 +
hw/nvram/eeprom_at24c.c | 3 +--
hw/tpm/tpm_emulator.c | 4 ----
hw/tpm/tpm_int.h | 2 --
hw/tpm/tpm_ioctl.h | 2 --
hw/xtensa/xtensa_memory.h | 1 -
include/exec/tb-lookup.h | 2 --
include/hw/intc/xlnx-pmu-iomod-intc.h | 1 -
include/hw/intc/xlnx-zynqmp-ipi.h | 1 -
include/hw/nvram/fw_cfg.h | 1 -
include/hw/pci-bridge/simba.h | 1 -
include/hw/xtensa/xtensa-isa.h | 2 --
include/qapi/clone-visitor.h | 1 -
include/sysemu/hvf.h | 2 --
include/ui/console.h | 1 -
io/channel-websock.c | 3 ---
linux-user/syscall.c | 1 -
scsi/pr-helper.h | 2 --
target/i386/hvf/vmx.h | 1 -
target/i386/hvf/x86hvf.c | 3 ---
target/xtensa/core-dc232b/xtensa-modules.c | 1 +
target/xtensa/core-dc233c/xtensa-modules.c | 1 +
target/xtensa/core-de212/xtensa-modules.c | 1 +
target/xtensa/core-fsf/xtensa-modules.c | 1 +
target/xtensa/core-sample_controller/xtensa-modules.c | 1 +
target/xtensa/xtensa-isa.c | 4 +---
tests/migration/stress.c | 10 +---------
tests/ptimer-test.c | 4 ++--
trace/control-internal.h | 2 --
31 files changed, 11 insertions(+), 51 deletions(-)
diff --git a/block/parallels.h b/block/parallels.h
index 4b044079ef..5aa101cfc8 100644
--- a/block/parallels.h
+++ b/block/parallels.h
@@ -32,7 +32,6 @@
#ifndef BLOCK_PARALLELS_H
#define BLOCK_PARALLELS_H
#include "qemu/coroutine.h"
-#include "qemu/typedefs.h"
#define HEADS_NUMBER 16
#define SEC_IN_CYL 32
diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
index b53b4c9c57..f840f07dfe 100644
--- a/hw/block/vhost-user-blk.c
+++ b/hw/block/vhost-user-blk.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
-#include "qemu/typedefs.h"
#include "qemu/cutils.h"
#include "qom/object.h"
#include "hw/qdev-core.h"
diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c
index 17aa930e39..a5d1776756 100644
--- a/hw/ide/sii3112.c
+++ b/hw/ide/sii3112.c
@@ -12,6 +12,7 @@
* http://wiki.osdev.org/User:Quok/Silicon_Image_Datasheets
*/
+#include "qemu/osdep.h"
#include <qemu/osdep.h>
#include <hw/ide/pci.h>
#include "trace.h"