Commit 14b6d44d authored by Markus Armbruster's avatar Markus Armbruster Committed by Paolo Bonzini

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: 's avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: 's avatarPaolo Bonzini <pbonzini@redhat.com>
parent da34e65c
......@@ -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
......@@ -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;
......
......@@ -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"
......
......@@ -12,8 +12,6 @@
#ifndef BLOCK_WRITE_THRESHOLD_H
#define BLOCK_WRITE_THRESHOLD_H
#include "qemu/typedefs.h"
#include "qemu-common.h"
/*
......
......@@ -14,7 +14,6 @@
#include "qemu/bswap.h"
#include "qemu/queue.h"
#include "qemu/fprintf-fn.h"
#include "qemu/typedefs.h"
/**
* CPUListState:
......
......@@ -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)
......
......@@ -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"
......
#ifndef HW_ACPI_PIIX4_H
#define HW_ACPI_PIIX4_H
#include "qemu/typedefs.h"
Object *piix4_pm_find(void);
#endif
......@@ -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 */
......
......@@ -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"
......
......@@ -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) \
......
......@@ -13,7 +13,6 @@
#define HOTPLUG_H
#include "qom/object.h"
#include "qemu/typedefs.h"
#define TYPE_HOTPLUG_HANDLER "hotplug-handler"
......
......@@ -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"
......
......@@ -4,7 +4,6 @@
#ifndef NO_QEMU_PROTOS
#include "exec/hwaddr.h"
#include "qemu/typedefs.h"
#endif
#define FW_CFG_SIGNATURE 0x00
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
#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);
......
......@@ -9,7 +9,6 @@
#include "hw/irq.h"
#include "qemu-common.h"
#include "qemu/typedefs.h"
/* xen-machine.c */
enum xen_mode {
......
......@@ -2,7 +2,6 @@
#define QEMU_QDEV_MONITOR_H
#include "hw/qdev-core.h"
#include "qemu/typedefs.h"
/*** monitor commands ***/
......
......@@ -11,7 +11,6 @@
#include "qom/object.h"
#include "qemu-common.h"
#include "qemu/typedefs.h"
#include "net/queue.h"
#define TYPE_NETFILTER "netfilter"
......
......@@ -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
......
......@@ -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__)
......
......@@ -15,7 +15,6 @@
#ifndef QEMU_COROUTINE_H
#define QEMU_COROUTINE_H
#include "qemu/typedefs.h"
#include "qemu/queue.h"
#include "qemu/timer.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);
......
#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"
......
......@@ -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);
......
......@@ -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;
......
......@@ -23,7 +23,6 @@
#ifndef HW_ACCEL_H
#define HW_ACCEL_H
#include "qemu/typedefs.h"
#include "qom/object.h"
typedef struct AccelState {
......
......@@ -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
......
......@@ -15,7 +15,6 @@
#define MEMORY_MAPPING_H
#include "qemu/queue.h"
#include "qemu/typedefs.h"
#include "exec/memory.h"
typedef struct GuestPhysBlock {
......
......@@ -13,7 +13,6 @@
*/
#include "qapi-types.h"
#include "qemu/typedefs.h"
/* replay clock kinds */
enum ReplayClockKind {
......
......@@ -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"
......
......@@ -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
......
......@@ -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
......
......@@ -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);
......
#include "qemu/osdep.h"
#include "stddef.h"
#include "qemu/typedefs.h"
const MonitorDef *target_monitor_defs(void);
......
......@@ -11,7 +11,6 @@
#define TRACE__CONTROL_H
#include "qemu-common.h"
#include "qemu/typedefs.h"
#include "trace/generated-events.h"
......
......@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
#include "qemu/typedefs.h"
#include "qmp-commands.h"
#include "trace/control.h"
......
......@@ -2,7 +2,6 @@
#include <glob.h>
#include <dirent.h>
#include "config-host.h"
#include "ui/egl-helpers.h"
EGLDisplay *qemu_egl_display;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment