Use scripts/clean-includes to drop redundant qemu/typedefs.h

Re-run scripts/clean-includes to apply the previous commit's
corrections and updates.  Besides redundant qemu/typedefs.h, this only
finds a redundant config-host.h include in ui/egl-helpers.c.  No idea
how that escaped the previous runs.

Some manual whitespace trimming around dropped includes squashed in.

Signed-off-by: Markus Armbruster <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>

diff --git a/hw/i386/acpi-build.h b/hw/i386/acpi-build.h
index 148c0f99777f2d03b45be50e25411de4976e1b4d..007332e51ca838f3f565377cf12460d58e12f001 100644 (file)
--- a/hw/i386/acpi-build.h
+++ b/hw/i386/acpi-build.h
@@ -2,8 +2,6 @@
 #ifndef HW_I386_ACPI_BUILD_H
 #define HW_I386_ACPI_BUILD_H
 
-#include "qemu/typedefs.h"
-
 void acpi_setup(void);
 
 #endif

diff --git a/include/block/accounting.h b/include/block/accounting.h
index 2db2a009a1adde34a5776248aafafbee54508a1c..20891639d5307b8d8f50c1d2eaeac03b38a610e6 100644 (file)
--- a/include/block/accounting.h
+++ b/include/block/accounting.h
@@ -25,8 +25,6 @@
 #ifndef BLOCK_ACCOUNTING_H
 #define BLOCK_ACCOUNTING_H
 
-
-#include "qemu/typedefs.h"
 #include "qemu/timed-average.h"
 
 typedef struct BlockAcctTimedStats BlockAcctTimedStats;

diff --git a/include/block/aio.h b/include/block/aio.h
index e086e3b4eeec96ad573a8ecb69dd0054c866714a..88a64eeb3c2263b65f8f07cf56a8de21bd99a49c 100644 (file)
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -14,7 +14,6 @@
 #ifndef QEMU_AIO_H
 #define QEMU_AIO_H
 
-#include "qemu/typedefs.h"
 #include "qemu-common.h"
 #include "qemu/queue.h"
 #include "qemu/event_notifier.h"

diff --git a/include/block/write-threshold.h b/include/block/write-threshold.h
index 8a79505ada920caea26ed0fb9bd0f34395dd2221..234d2193e0eaed80a2fe0568a1427df745ee615a 100644 (file)
--- a/include/block/write-threshold.h
+++ b/include/block/write-threshold.h
@@ -12,8 +12,6 @@
 #ifndef BLOCK_WRITE_THRESHOLD_H
 #define BLOCK_WRITE_THRESHOLD_H
 
-
-#include "qemu/typedefs.h"
 #include "qemu-common.h"
 
 /*

diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index a0ad2acb43ca3fa3c82c92e75ae705a49678319b..9e839e50cd5489986662cad35a7a2e1578d82ab5 100644 (file)
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -14,7 +14,6 @@
 #include "qemu/bswap.h"
 #include "qemu/queue.h"
 #include "qemu/fprintf-fn.h"
-#include "qemu/typedefs.h"
 
 /**
  * CPUListState:

diff --git a/include/exec/memory.h b/include/exec/memory.h
index 2de789871d29bbd6d9332e2ca9e24bc90c66aab2..e2a3e9953c99f31a9261bed3a1a5c0bffac03ec0 100644 (file)
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -31,7 +31,6 @@
 #include "qemu/notify.h"
 #include "qom/object.h"
 #include "qemu/rcu.h"
-#include "qemu/typedefs.h"
 
 #define MAX_PHYS_ADDR_SPACE_BITS 62
 #define MAX_PHYS_ADDR            (((hwaddr)1 << MAX_PHYS_ADDR_SPACE_BITS) - 1)

diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h
index 7462e20fe344697769276793316df10f92d713a3..443687d4840b6c6672158023d2b4dc3dc5f681f6 100644 (file)
--- a/include/hw/acpi/acpi.h
+++ b/include/hw/acpi/acpi.h
@@ -19,7 +19,6 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include "qemu/typedefs.h"
 #include "qemu/notify.h"
 #include "qemu/option.h"
 #include "exec/memory.h"

diff --git a/include/hw/acpi/piix4.h b/include/hw/acpi/piix4.h
index 65e6fd7aa090f0a8aeee60cecc3d4081a1376f92..26c2370e308cfdbedaacd7dfc224de27125c6dff 100644 (file)
--- a/include/hw/acpi/piix4.h
+++ b/include/hw/acpi/piix4.h
@@ -1,8 +1,6 @@
 #ifndef HW_ACPI_PIIX4_H
 #define HW_ACPI_PIIX4_H
 
-#include "qemu/typedefs.h"
-
 Object *piix4_pm_find(void);
 
 #endif

diff --git a/include/hw/acpi/tco.h b/include/hw/acpi/tco.h
index c63afc8ca3a9eb056af509855a23d6dbf8969cc9..52ad767ddda319c0da00aa0ca9f1ea7c99db7e29 100644 (file)
--- a/include/hw/acpi/tco.h
+++ b/include/hw/acpi/tco.h
@@ -9,7 +9,6 @@
 #ifndef HW_ACPI_TCO_H
 #define HW_ACPI_TCO_H
 
-#include "qemu/typedefs.h"
 #include "qemu-common.h"
 
 /* As per ICH9 spec, the internal timer has an error of ~0.6s on every tick */

diff --git a/include/hw/boards.h b/include/hw/boards.h
index 8efce0f91e0a833e30f37db83ad1ed243e7e75b2..aad5f2a99fd9e0535ebb6078aa2c99b979325195 100644 (file)
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -3,7 +3,6 @@
 #ifndef HW_BOARDS_H
 #define HW_BOARDS_H
 
-#include "qemu/typedefs.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/accel.h"
 #include "hw/qdev.h"

diff --git a/include/hw/char/digic-uart.h b/include/hw/char/digic-uart.h
index ef83a3059c1b076fbe20fa423075c9533ded3601..7b3f145372b75064ca6e78bae33a6bed7597708f 100644 (file)
--- a/include/hw/char/digic-uart.h
+++ b/include/hw/char/digic-uart.h
@@ -19,7 +19,6 @@
 #define HW_CHAR_DIGIC_UART_H
 
 #include "hw/sysbus.h"
-#include "qemu/typedefs.h"
 
 #define TYPE_DIGIC_UART "digic-uart"
 #define DIGIC_UART(obj) \

diff --git a/include/hw/hotplug.h b/include/hw/hotplug.h
index 2db025d0bdcf67875b18544900cb94c605c7f303..da1d0e4ab80b7c9e57c002951da954b40876c68a 100644 (file)
--- a/include/hw/hotplug.h
+++ b/include/hw/hotplug.h
@@ -13,7 +13,6 @@
 #define HOTPLUG_H
 
 #include "qom/object.h"
-#include "qemu/typedefs.h"
 
 #define TYPE_HOTPLUG_HANDLER "hotplug-handler"
 

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 847d92f5508308f6f2fa8672c2455a26babe6833..96f0b66c77fafaeab2d349f23e2b800c59552022 100644 (file)
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -2,7 +2,6 @@
 #define HW_PC_H
 
 #include "qemu-common.h"
-#include "qemu/typedefs.h"
 #include "exec/memory.h"
 #include "hw/boards.h"
 #include "hw/isa/isa.h"

diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
index 4315f4e5824de2b18c4cc9c61daca7aa27a470fe..10a99715b20c05d718f2b990db8295b70fb7fb68 100644 (file)
--- a/include/hw/nvram/fw_cfg.h
+++ b/include/hw/nvram/fw_cfg.h
@@ -4,7 +4,6 @@
 #ifndef NO_QEMU_PROTOS
 
 #include "exec/hwaddr.h"
-#include "qemu/typedefs.h"
 #endif
 
 #define FW_CFG_SIGNATURE        0x00

diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index c3ff99f9759f265e1657be07d64f52a05142fbc3..1ce02b20daf0e21eb3df28f0760825e14ccee9f8 100644 (file)
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -3,7 +3,6 @@
 
 #include "qemu/queue.h"
 #include "qemu/option.h"
-#include "qemu/typedefs.h"
 #include "qemu/bitmap.h"
 #include "qom/object.h"
 #include "hw/irq.h"

diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
index 29052f81a55b2d332956e2e8e323c1822e3076f8..8acd3fa998b779c15548acd4fd85f3592e99286e 100644 (file)
--- a/include/hw/scsi/scsi.h
+++ b/include/hw/scsi/scsi.h
@@ -2,7 +2,6 @@
 #define QEMU_HW_SCSI_H
 
 #include "hw/qdev.h"
-#include "qemu/typedefs.h"
 #include "hw/block/block.h"
 #include "sysemu/sysemu.h"
 #include "qemu/notify.h"

diff --git a/include/hw/timer/digic-timer.h b/include/hw/timer/digic-timer.h
index ae913482c6acd3540e4c01f7f7a6772d8790c19e..d9e67fe291746f72570614d281761dcc2b918a40 100644 (file)
--- a/include/hw/timer/digic-timer.h
+++ b/include/hw/timer/digic-timer.h
@@ -19,7 +19,6 @@
 #define HW_TIMER_DIGIC_TIMER_H
 
 #include "hw/sysbus.h"
-#include "qemu/typedefs.h"
 #include "hw/ptimer.h"
 
 #define TYPE_DIGIC_TIMER "digic-timer"

diff --git a/include/hw/vfio/vfio.h b/include/hw/vfio/vfio.h
index 7153604cd1a985d8e444966645cbe394ed1f3f35..f27d599220b8a3f01cf96bb2a63886d501ca94bb 100644 (file)
--- a/include/hw/vfio/vfio.h
+++ b/include/hw/vfio/vfio.h
@@ -1,8 +1,6 @@
 #ifndef VFIO_API_H
 #define VFIO_API_H
 
-#include "qemu/typedefs.h"
-
 bool vfio_eeh_as_ok(AddressSpace *as);
 int vfio_eeh_as_op(AddressSpace *as, uint32_t op);
 

diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
index bf3fe9792775b6705bec13ab43673b21e6471a1b..6eb815aacebbb8f10c9e67cc6b2f6a437a35f831 100644 (file)
--- a/include/hw/xen/xen.h
+++ b/include/hw/xen/xen.h
@@ -9,7 +9,6 @@
 
 #include "hw/irq.h"
 #include "qemu-common.h"
-#include "qemu/typedefs.h"
 
 /* xen-machine.c */
 enum xen_mode {

diff --git a/include/monitor/qdev.h b/include/monitor/qdev.h
index 50ec2ffc123fabac3d1bce09199e520e0f92815e..c4b8a0514698c265b5e5f6d3e0cff98bed5f65f0 100644 (file)
--- a/include/monitor/qdev.h
+++ b/include/monitor/qdev.h
@@ -2,7 +2,6 @@
 #define QEMU_QDEV_MONITOR_H
 
 #include "hw/qdev-core.h"
-#include "qemu/typedefs.h"
 
 /*** monitor commands ***/
 

diff --git a/include/net/filter.h b/include/net/filter.h
index cfb11728dfae64617b5bd83ef7029be2fb2c8081..0c4a2ea6c90f4a1676d0e7c27ae408ed85514489 100644 (file)
--- a/include/net/filter.h
+++ b/include/net/filter.h
@@ -11,7 +11,6 @@
 
 #include "qom/object.h"
 #include "qemu-common.h"
-#include "qemu/typedefs.h"
 #include "net/queue.h"
 
 #define TYPE_NETFILTER "netfilter"

diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h
index 1000da2bdabd8db084178839b921d87f013f2126..9a8d0105fbbcbe9ebe566753ad441d9c62e242de 100644 (file)
--- a/include/qapi/visitor.h
+++ b/include/qapi/visitor.h
@@ -14,7 +14,6 @@
 #ifndef QAPI_VISITOR_CORE_H
 #define QAPI_VISITOR_CORE_H
 
-#include "qemu/typedefs.h"
 #include "qapi/qmp/qobject.h"
 
 /* This struct is layout-compatible with all other *List structs

diff --git a/include/qemu-common.h b/include/qemu-common.h
index 887ca71c8adff1456b91a6d34a4948d2090d00c5..2de4ce201933a2a476005d5ecd48470cedce4ffa 100644 (file)
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -12,7 +12,6 @@
 #ifndef QEMU_COMMON_H
 #define QEMU_COMMON_H
 
-#include "qemu/typedefs.h"
 #include "qemu/fprintf-fn.h"
 
 #if defined(__arm__) || defined(__sparc__) || defined(__mips__) || defined(__hppa__) || defined(__ia64__)

diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
index 99b939846b671ce25b54ae7d6c514c2e32ca16d7..305fe76c29d51654d394255e5facc196fe644c41 100644 (file)
--- a/include/qemu/coroutine.h
+++ b/include/qemu/coroutine.h
@@ -15,7 +15,6 @@
 #ifndef QEMU_COROUTINE_H
 #define QEMU_COROUTINE_H
 
-#include "qemu/typedefs.h"
 #include "qemu/queue.h"
 #include "qemu/timer.h"
 

diff --git a/include/qemu/option.h b/include/qemu/option.h
index 8809ce1e7535386a5a200fcac8bb6bd9336e4e02..8542d2dfd6225984aba5b1e1dce05281a6ba3e9e 100644 (file)
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -28,7 +28,6 @@
 
 #include "qemu/queue.h"
 #include "qapi/qmp/qdict.h"
-#include "qemu/typedefs.h"
 
 const char *get_opt_name(char *buf, int buf_size, const char *p, char delim);
 const char *get_opt_value(char *buf, int buf_size, const char *p);

diff --git a/include/qemu/timer.h b/include/qemu/timer.h
index 7197d0859aed10714f9e10c58c8bc646bd13f8a0..028e309b7b75d0454b973b17fffeeae19a2ccfba 100644 (file)
--- a/include/qemu/timer.h
+++ b/include/qemu/timer.h
@@ -1,7 +1,6 @@
 #ifndef QEMU_TIMER_H
 #define QEMU_TIMER_H
 
-#include "qemu/typedefs.h"
 #include "qemu-common.h"
 #include "qemu/notify.h"
 #include "qemu/host-utils.h"

diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 7052eee7b78ad1e1c9ccf96e7a3dddd953ee9329..0b6fa2507ca2a4912e2086af88fb5bf2cd0bde86 100644 (file)
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -27,7 +27,6 @@
 #include "exec/memattrs.h"
 #include "qemu/queue.h"
 #include "qemu/thread.h"
-#include "qemu/typedefs.h"
 
 typedef int (*WriteCoreDumpFunction)(const void *buf, size_t size,
                                      void *opaque);

diff --git a/include/qom/object.h b/include/qom/object.h
index 0eba22ef8324063689467052c0c3bdffc6e6e88e..21bb5ff1495960bdc2b0c7e725b9ca6eee64c577 100644 (file)
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -17,7 +17,6 @@
 #include <glib.h>
 #include "qapi-types.h"
 #include "qemu/queue.h"
-#include "qemu/typedefs.h"
 
 struct TypeImpl;
 typedef struct TypeImpl *Type;

diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h
index 997720f36c2399e16e916905f7a3f5d3b253eeaa..a74b2faf5f588db19127c9ebadb647f9f98f888d 100644 (file)
--- a/include/sysemu/accel.h
+++ b/include/sysemu/accel.h
@@ -23,7 +23,6 @@
 #ifndef HW_ACCEL_H
 #define HW_ACCEL_H
 
-#include "qemu/typedefs.h"
 #include "qom/object.h"
 
 typedef struct AccelState {

diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index d839bffeb0f4dfeb7cb73c99981a87ea80ad4d8d..70f4eaf1e73572bee859c8cf688257d4dbada20d 100644 (file)
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -13,8 +13,6 @@
 #ifndef BLOCK_BACKEND_H
 #define BLOCK_BACKEND_H
 
-#include "qemu/typedefs.h"
-
 /*
  * TODO Have to include block/block.h for a bunch of block layer
  * types.  Unfortunately, this pulls in the whole BlockDriverState

diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mapping.h
index d46d879b9461e67bafdc95dd666ba40092fad599..706152d53346931cf505eab02b9d7f6566ba2424 100644 (file)
--- a/include/sysemu/memory_mapping.h
+++ b/include/sysemu/memory_mapping.h
@@ -15,7 +15,6 @@
 #define MEMORY_MAPPING_H
 
 #include "qemu/queue.h"
-#include "qemu/typedefs.h"
 #include "exec/memory.h"
 
 typedef struct GuestPhysBlock {

diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index e7989199fcfcdc886faf3e502c0a098b4b033408..5854adc4e65205afb7cca31252f99498e4d9cd1e 100644 (file)
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -13,7 +13,6 @@
  */
 
 #include "qapi-types.h"
-#include "qemu/typedefs.h"
 
 /* replay clock kinds */
 enum ReplayClockKind {

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 3bb8897727acc5657ce0b00ea3fcf43957fbf847..38fb3cad35e1bc71d6fbd1c764a88cabae97eb54 100644 (file)
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -2,7 +2,6 @@
 #define SYSEMU_H
 /* Misc. things related to the system emulator.  */
 
-#include "qemu/typedefs.h"
 #include "qemu/option.h"
 #include "qemu/queue.h"
 #include "qemu/timer.h"

diff --git a/include/ui/console.h b/include/ui/console.h
index f63697182f6c3c1293b66a4bf1e3b94175ab1954..eb9419dfd69195186570cd3986f0196aa8f5a879 100644 (file)
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -5,7 +5,6 @@
 #include "qom/object.h"
 #include "qapi/qmp/qdict.h"
 #include "qemu/notify.h"
-#include "qemu/typedefs.h"
 #include "qapi-types.h"
 
 #ifdef CONFIG_OPENGL

diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h
index e34c4effcbfe22defe37ddb79778bdbf113f9bb3..4a67e01232d7acd66498b4e55f731b52a109fa4e 100644 (file)
--- a/include/ui/qemu-pixman.h
+++ b/include/ui/qemu-pixman.h
@@ -16,8 +16,6 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "qemu/typedefs.h"
-
 /*
  * pixman image formats are defined to be native endian,
  * that means host byte order on qemu.  So we go define

diff --git a/stubs/target-get-monitor-def.c b/stubs/target-get-monitor-def.c
index 4d1033d12df6ec466945b8c6a8d52394901731f6..dd8305274523931e5966a02dcdfdef23761ff6cd 100644 (file)
--- a/stubs/target-get-monitor-def.c
+++ b/stubs/target-get-monitor-def.c
@@ -20,7 +20,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu/typedefs.h"
 #include "stdint.h"
 
 int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval);

diff --git a/stubs/target-monitor-defs.c b/stubs/target-monitor-defs.c
index 203ebb0f2731bfb3ffdcec1cecc71838bce2d389..7a16ad70146d7c647ca13271e1dd856db6f64dae 100644 (file)
--- a/stubs/target-monitor-defs.c
+++ b/stubs/target-monitor-defs.c
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "stddef.h"
-#include "qemu/typedefs.h"
 
 const MonitorDef *target_monitor_defs(void);
 

diff --git a/trace/control.h b/trace/control.h
index f0fe535804124f611b6f0ef835d4404163c6e9b6..e2ba6d4de1ba646f2315c43cd512bfc66c0f84fc 100644 (file)
--- a/trace/control.h
+++ b/trace/control.h
@@ -11,7 +11,6 @@
 #define TRACE__CONTROL_H
 
 #include "qemu-common.h"
-#include "qemu/typedefs.h"
 #include "trace/generated-events.h"
 
 

diff --git a/trace/qmp.c b/trace/qmp.c
index 6320b4b3b102d49753ba6f23ec9f9987e9d1d50b..8aa2660aac2d13748cd9ae82622c351d06a3de4e 100644 (file)
--- a/trace/qmp.c
+++ b/trace/qmp.c
@@ -8,7 +8,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu/typedefs.h"
 #include "qmp-commands.h"
 #include "trace/control.h"
 

diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
index 54be44ccea469e84f2dc32f064e3af31895a3ead..558edfdeb75aeecc6c269aff3d9e610ffaef4e20 100644 (file)
--- a/ui/egl-helpers.c
+++ b/ui/egl-helpers.c
@@ -2,7 +2,6 @@
 #include <glob.h>
 #include <dirent.h>
 
-#include "config-host.h"
 #include "ui/egl-helpers.h"
 
 EGLDisplay *qemu_egl_display;