qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

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 <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

authored by

Markus Armbruster and committed by
Paolo Bonzini
14b6d44d da34e65c

-47
-2
hw/i386/acpi-build.h
··· 2 2 #ifndef HW_I386_ACPI_BUILD_H 3 3 #define HW_I386_ACPI_BUILD_H 4 4 5 - #include "qemu/typedefs.h" 6 - 7 5 void acpi_setup(void); 8 6 9 7 #endif
-2
include/block/accounting.h
··· 25 25 #ifndef BLOCK_ACCOUNTING_H 26 26 #define BLOCK_ACCOUNTING_H 27 27 28 - 29 - #include "qemu/typedefs.h" 30 28 #include "qemu/timed-average.h" 31 29 32 30 typedef struct BlockAcctTimedStats BlockAcctTimedStats;
-1
include/block/aio.h
··· 14 14 #ifndef QEMU_AIO_H 15 15 #define QEMU_AIO_H 16 16 17 - #include "qemu/typedefs.h" 18 17 #include "qemu-common.h" 19 18 #include "qemu/queue.h" 20 19 #include "qemu/event_notifier.h"
-2
include/block/write-threshold.h
··· 12 12 #ifndef BLOCK_WRITE_THRESHOLD_H 13 13 #define BLOCK_WRITE_THRESHOLD_H 14 14 15 - 16 - #include "qemu/typedefs.h" 17 15 #include "qemu-common.h" 18 16 19 17 /*
-1
include/exec/cpu-common.h
··· 14 14 #include "qemu/bswap.h" 15 15 #include "qemu/queue.h" 16 16 #include "qemu/fprintf-fn.h" 17 - #include "qemu/typedefs.h" 18 17 19 18 /** 20 19 * CPUListState:
-1
include/exec/memory.h
··· 31 31 #include "qemu/notify.h" 32 32 #include "qom/object.h" 33 33 #include "qemu/rcu.h" 34 - #include "qemu/typedefs.h" 35 34 36 35 #define MAX_PHYS_ADDR_SPACE_BITS 62 37 36 #define MAX_PHYS_ADDR (((hwaddr)1 << MAX_PHYS_ADDR_SPACE_BITS) - 1)
-1
include/hw/acpi/acpi.h
··· 19 19 * <http://www.gnu.org/licenses/>. 20 20 */ 21 21 22 - #include "qemu/typedefs.h" 23 22 #include "qemu/notify.h" 24 23 #include "qemu/option.h" 25 24 #include "exec/memory.h"
-2
include/hw/acpi/piix4.h
··· 1 1 #ifndef HW_ACPI_PIIX4_H 2 2 #define HW_ACPI_PIIX4_H 3 3 4 - #include "qemu/typedefs.h" 5 - 6 4 Object *piix4_pm_find(void); 7 5 8 6 #endif
-1
include/hw/acpi/tco.h
··· 9 9 #ifndef HW_ACPI_TCO_H 10 10 #define HW_ACPI_TCO_H 11 11 12 - #include "qemu/typedefs.h" 13 12 #include "qemu-common.h" 14 13 15 14 /* As per ICH9 spec, the internal timer has an error of ~0.6s on every tick */
-1
include/hw/boards.h
··· 3 3 #ifndef HW_BOARDS_H 4 4 #define HW_BOARDS_H 5 5 6 - #include "qemu/typedefs.h" 7 6 #include "sysemu/blockdev.h" 8 7 #include "sysemu/accel.h" 9 8 #include "hw/qdev.h"
-1
include/hw/char/digic-uart.h
··· 19 19 #define HW_CHAR_DIGIC_UART_H 20 20 21 21 #include "hw/sysbus.h" 22 - #include "qemu/typedefs.h" 23 22 24 23 #define TYPE_DIGIC_UART "digic-uart" 25 24 #define DIGIC_UART(obj) \
-1
include/hw/hotplug.h
··· 13 13 #define HOTPLUG_H 14 14 15 15 #include "qom/object.h" 16 - #include "qemu/typedefs.h" 17 16 18 17 #define TYPE_HOTPLUG_HANDLER "hotplug-handler" 19 18
-1
include/hw/i386/pc.h
··· 2 2 #define HW_PC_H 3 3 4 4 #include "qemu-common.h" 5 - #include "qemu/typedefs.h" 6 5 #include "exec/memory.h" 7 6 #include "hw/boards.h" 8 7 #include "hw/isa/isa.h"
-1
include/hw/nvram/fw_cfg.h
··· 4 4 #ifndef NO_QEMU_PROTOS 5 5 6 6 #include "exec/hwaddr.h" 7 - #include "qemu/typedefs.h" 8 7 #endif 9 8 10 9 #define FW_CFG_SIGNATURE 0x00
-1
include/hw/qdev-core.h
··· 3 3 4 4 #include "qemu/queue.h" 5 5 #include "qemu/option.h" 6 - #include "qemu/typedefs.h" 7 6 #include "qemu/bitmap.h" 8 7 #include "qom/object.h" 9 8 #include "hw/irq.h"
-1
include/hw/scsi/scsi.h
··· 2 2 #define QEMU_HW_SCSI_H 3 3 4 4 #include "hw/qdev.h" 5 - #include "qemu/typedefs.h" 6 5 #include "hw/block/block.h" 7 6 #include "sysemu/sysemu.h" 8 7 #include "qemu/notify.h"
-1
include/hw/timer/digic-timer.h
··· 19 19 #define HW_TIMER_DIGIC_TIMER_H 20 20 21 21 #include "hw/sysbus.h" 22 - #include "qemu/typedefs.h" 23 22 #include "hw/ptimer.h" 24 23 25 24 #define TYPE_DIGIC_TIMER "digic-timer"
-2
include/hw/vfio/vfio.h
··· 1 1 #ifndef VFIO_API_H 2 2 #define VFIO_API_H 3 3 4 - #include "qemu/typedefs.h" 5 - 6 4 bool vfio_eeh_as_ok(AddressSpace *as); 7 5 int vfio_eeh_as_op(AddressSpace *as, uint32_t op); 8 6
-1
include/hw/xen/xen.h
··· 9 9 10 10 #include "hw/irq.h" 11 11 #include "qemu-common.h" 12 - #include "qemu/typedefs.h" 13 12 14 13 /* xen-machine.c */ 15 14 enum xen_mode {
-1
include/monitor/qdev.h
··· 2 2 #define QEMU_QDEV_MONITOR_H 3 3 4 4 #include "hw/qdev-core.h" 5 - #include "qemu/typedefs.h" 6 5 7 6 /*** monitor commands ***/ 8 7
-1
include/net/filter.h
··· 11 11 12 12 #include "qom/object.h" 13 13 #include "qemu-common.h" 14 - #include "qemu/typedefs.h" 15 14 #include "net/queue.h" 16 15 17 16 #define TYPE_NETFILTER "netfilter"
-1
include/qapi/visitor.h
··· 14 14 #ifndef QAPI_VISITOR_CORE_H 15 15 #define QAPI_VISITOR_CORE_H 16 16 17 - #include "qemu/typedefs.h" 18 17 #include "qapi/qmp/qobject.h" 19 18 20 19 /* This struct is layout-compatible with all other *List structs
-1
include/qemu-common.h
··· 12 12 #ifndef QEMU_COMMON_H 13 13 #define QEMU_COMMON_H 14 14 15 - #include "qemu/typedefs.h" 16 15 #include "qemu/fprintf-fn.h" 17 16 18 17 #if defined(__arm__) || defined(__sparc__) || defined(__mips__) || defined(__hppa__) || defined(__ia64__)
-1
include/qemu/coroutine.h
··· 15 15 #ifndef QEMU_COROUTINE_H 16 16 #define QEMU_COROUTINE_H 17 17 18 - #include "qemu/typedefs.h" 19 18 #include "qemu/queue.h" 20 19 #include "qemu/timer.h" 21 20
-1
include/qemu/option.h
··· 28 28 29 29 #include "qemu/queue.h" 30 30 #include "qapi/qmp/qdict.h" 31 - #include "qemu/typedefs.h" 32 31 33 32 const char *get_opt_name(char *buf, int buf_size, const char *p, char delim); 34 33 const char *get_opt_value(char *buf, int buf_size, const char *p);
-1
include/qemu/timer.h
··· 1 1 #ifndef QEMU_TIMER_H 2 2 #define QEMU_TIMER_H 3 3 4 - #include "qemu/typedefs.h" 5 4 #include "qemu-common.h" 6 5 #include "qemu/notify.h" 7 6 #include "qemu/host-utils.h"
-1
include/qom/cpu.h
··· 27 27 #include "exec/memattrs.h" 28 28 #include "qemu/queue.h" 29 29 #include "qemu/thread.h" 30 - #include "qemu/typedefs.h" 31 30 32 31 typedef int (*WriteCoreDumpFunction)(const void *buf, size_t size, 33 32 void *opaque);
-1
include/qom/object.h
··· 17 17 #include <glib.h> 18 18 #include "qapi-types.h" 19 19 #include "qemu/queue.h" 20 - #include "qemu/typedefs.h" 21 20 22 21 struct TypeImpl; 23 22 typedef struct TypeImpl *Type;
-1
include/sysemu/accel.h
··· 23 23 #ifndef HW_ACCEL_H 24 24 #define HW_ACCEL_H 25 25 26 - #include "qemu/typedefs.h" 27 26 #include "qom/object.h" 28 27 29 28 typedef struct AccelState {
-2
include/sysemu/block-backend.h
··· 13 13 #ifndef BLOCK_BACKEND_H 14 14 #define BLOCK_BACKEND_H 15 15 16 - #include "qemu/typedefs.h" 17 - 18 16 /* 19 17 * TODO Have to include block/block.h for a bunch of block layer 20 18 * types. Unfortunately, this pulls in the whole BlockDriverState
-1
include/sysemu/memory_mapping.h
··· 15 15 #define MEMORY_MAPPING_H 16 16 17 17 #include "qemu/queue.h" 18 - #include "qemu/typedefs.h" 19 18 #include "exec/memory.h" 20 19 21 20 typedef struct GuestPhysBlock {
-1
include/sysemu/replay.h
··· 13 13 */ 14 14 15 15 #include "qapi-types.h" 16 - #include "qemu/typedefs.h" 17 16 18 17 /* replay clock kinds */ 19 18 enum ReplayClockKind {
-1
include/sysemu/sysemu.h
··· 2 2 #define SYSEMU_H 3 3 /* Misc. things related to the system emulator. */ 4 4 5 - #include "qemu/typedefs.h" 6 5 #include "qemu/option.h" 7 6 #include "qemu/queue.h" 8 7 #include "qemu/timer.h"
-1
include/ui/console.h
··· 5 5 #include "qom/object.h" 6 6 #include "qapi/qmp/qdict.h" 7 7 #include "qemu/notify.h" 8 - #include "qemu/typedefs.h" 9 8 #include "qapi-types.h" 10 9 11 10 #ifdef CONFIG_OPENGL
-2
include/ui/qemu-pixman.h
··· 16 16 #pragma GCC diagnostic pop 17 17 #endif 18 18 19 - #include "qemu/typedefs.h" 20 - 21 19 /* 22 20 * pixman image formats are defined to be native endian, 23 21 * that means host byte order on qemu. So we go define
-1
stubs/target-get-monitor-def.c
··· 20 20 */ 21 21 22 22 #include "qemu/osdep.h" 23 - #include "qemu/typedefs.h" 24 23 #include "stdint.h" 25 24 26 25 int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval);
-1
stubs/target-monitor-defs.c
··· 1 1 #include "qemu/osdep.h" 2 2 #include "stddef.h" 3 - #include "qemu/typedefs.h" 4 3 5 4 const MonitorDef *target_monitor_defs(void); 6 5
-1
trace/control.h
··· 11 11 #define TRACE__CONTROL_H 12 12 13 13 #include "qemu-common.h" 14 - #include "qemu/typedefs.h" 15 14 #include "trace/generated-events.h" 16 15 17 16
-1
trace/qmp.c
··· 8 8 */ 9 9 10 10 #include "qemu/osdep.h" 11 - #include "qemu/typedefs.h" 12 11 #include "qmp-commands.h" 13 12 #include "trace/control.h" 14 13
-1
ui/egl-helpers.c
··· 2 2 #include <glob.h> 3 3 #include <dirent.h> 4 4 5 - #include "config-host.h" 6 5 #include "ui/egl-helpers.h" 7 6 8 7 EGLDisplay *qemu_egl_display;