From: Markus Armbruster Date: Thu, 2 Feb 2023 13:38:28 +0000 (+0100) Subject: Don't include headers already included by qemu/osdep.h X-Git-Tag: v8.0.0-rc0~66^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfe7bf8590a74aebd572abe56927b53f4978ab42;p=thirdparty%2Fqemu.git Don't include headers already included by qemu/osdep.h This commit was created with scripts/clean-includes. Signed-off-by: Markus Armbruster Acked-by: Christian Schoenebeck Reviewed-by: Michael S. Tsirkin Message-Id: <20230202133830.2152150-19-armbru@redhat.com> --- diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 9c857eeb077..5357608b144 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -28,7 +28,6 @@ #include "exec/exec-all.h" #include "tcg/tcg.h" #include "qemu/atomic.h" -#include "qemu/compiler.h" #include "qemu/timer.h" #include "qemu/rcu.h" #include "exec/log.h" diff --git a/backends/tpm/tpm_ioctl.h b/backends/tpm/tpm_ioctl.h index e506ef51605..b1d31768a6d 100644 --- a/backends/tpm/tpm_ioctl.h +++ b/backends/tpm/tpm_ioctl.h @@ -12,8 +12,6 @@ # define __USE_LINUX_IOCTL_DEFS #endif -#include -#include #ifndef _WIN32 #include #include diff --git a/fsdev/p9array.h b/fsdev/p9array.h index 90e83a7c7b5..50a1b15fe97 100644 --- a/fsdev/p9array.h +++ b/fsdev/p9array.h @@ -27,8 +27,6 @@ #ifndef QEMU_P9ARRAY_H #define QEMU_P9ARRAY_H -#include "qemu/compiler.h" - /** * P9Array provides a mechanism to access arrays in common C-style (e.g. by * square bracket [] operator) in conjunction with reference variables that diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 072cf67956a..9621ec13416 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -19,8 +19,6 @@ #include "qemu/osdep.h" #ifdef CONFIG_LINUX #include -#else -#include #endif #include #include "hw/virtio/virtio.h" diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c index 8bdf4bac6e4..847fa4c0cc3 100644 --- a/hw/display/virtio-gpu-udmabuf.c +++ b/hw/display/virtio-gpu-udmabuf.c @@ -21,7 +21,6 @@ #include "exec/ramblock.h" #include "sysemu/hostmem.h" #include -#include #include #include "qemu/memfd.h" #include "standard-headers/linux/udmabuf.h" diff --git a/hw/i2c/pmbus_device.c b/hw/i2c/pmbus_device.c index 4071a88cfcd..c3d60467845 100644 --- a/hw/i2c/pmbus_device.c +++ b/hw/i2c/pmbus_device.c @@ -8,7 +8,6 @@ #include "qemu/osdep.h" #include -#include #include "hw/i2c/pmbus_device.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c index eb9918fe72b..18d96a1d04d 100644 --- a/hw/remote/proxy-memory-listener.c +++ b/hw/remote/proxy-memory-listener.c @@ -8,7 +8,6 @@ #include "qemu/osdep.h" -#include "qemu/compiler.h" #include "qemu/int128.h" #include "qemu/range.h" #include "exec/memory.h" diff --git a/hw/sensor/adm1272.c b/hw/sensor/adm1272.c index 7310c769be2..8f4a1c2cd4b 100644 --- a/hw/sensor/adm1272.c +++ b/hw/sensor/adm1272.c @@ -8,7 +8,6 @@ */ #include "qemu/osdep.h" -#include #include "hw/i2c/pmbus_device.h" #include "hw/irq.h" #include "migration/vmstate.h" diff --git a/hw/usb/dev-storage-bot.c b/hw/usb/dev-storage-bot.c index b24b3148c28..1e5c5c711f5 100644 --- a/hw/usb/dev-storage-bot.c +++ b/hw/usb/dev-storage-bot.c @@ -8,7 +8,6 @@ */ #include "qemu/osdep.h" -#include "qemu/typedefs.h" #include "qapi/error.h" #include "hw/usb.h" #include "hw/usb/desc.h" diff --git a/hw/usb/dev-storage-classic.c b/hw/usb/dev-storage-classic.c index 00f25bade28..84d19752b55 100644 --- a/hw/usb/dev-storage-classic.c +++ b/hw/usb/dev-storage-classic.c @@ -8,7 +8,6 @@ */ #include "qemu/osdep.h" -#include "qemu/typedefs.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/usb.h" diff --git a/include/hw/misc/aspeed_lpc.h b/include/hw/misc/aspeed_lpc.h index fd228731d2f..fa398959af2 100644 --- a/include/hw/misc/aspeed_lpc.h +++ b/include/hw/misc/aspeed_lpc.h @@ -12,8 +12,6 @@ #include "hw/sysbus.h" -#include - #define TYPE_ASPEED_LPC "aspeed.lpc" #define ASPEED_LPC(obj) OBJECT_CHECK(AspeedLPCState, (obj), TYPE_ASPEED_LPC) diff --git a/include/hw/pci/pcie_doe.h b/include/hw/pci/pcie_doe.h index ba4d8b03bd3..87dc17dcef9 100644 --- a/include/hw/pci/pcie_doe.h +++ b/include/hw/pci/pcie_doe.h @@ -11,7 +11,6 @@ #define PCIE_DOE_H #include "qemu/range.h" -#include "qemu/typedefs.h" #include "hw/register.h" /* diff --git a/include/qemu/async-teardown.h b/include/qemu/async-teardown.h index 092e7a37e7a..b281da005b5 100644 --- a/include/qemu/async-teardown.h +++ b/include/qemu/async-teardown.h @@ -13,8 +13,6 @@ #ifndef QEMU_ASYNC_TEARDOWN_H #define QEMU_ASYNC_TEARDOWN_H -#include "config-host.h" - #ifdef CONFIG_LINUX void init_async_teardown(void); #endif diff --git a/include/qemu/dbus.h b/include/qemu/dbus.h index 08f00dfd534..81d3de8a5a1 100644 --- a/include/qemu/dbus.h +++ b/include/qemu/dbus.h @@ -15,7 +15,6 @@ #include "qom/object.h" #include "chardev/char.h" #include "qemu/notify.h" -#include "qemu/typedefs.h" /* glib/gio 2.68 */ #define DBUS_METHOD_INVOCATION_HANDLED TRUE diff --git a/include/qemu/host-utils.h b/include/qemu/host-utils.h index 88d476161cc..3ce62bf4a56 100644 --- a/include/qemu/host-utils.h +++ b/include/qemu/host-utils.h @@ -30,7 +30,6 @@ #ifndef HOST_UTILS_H #define HOST_UTILS_H -#include "qemu/compiler.h" #include "qemu/bswap.h" #include "qemu/int128.h" diff --git a/include/sysemu/event-loop-base.h b/include/sysemu/event-loop-base.h index 2748bf6ae1f..a6c24f13513 100644 --- a/include/sysemu/event-loop-base.h +++ b/include/sysemu/event-loop-base.h @@ -14,7 +14,6 @@ #include "qom/object.h" #include "block/aio.h" -#include "qemu/typedefs.h" #define TYPE_EVENT_LOOP_BASE "event-loop-base" OBJECT_DECLARE_TYPE(EventLoopBase, EventLoopBaseClass, diff --git a/softmmu/vl.c b/softmmu/vl.c index 9177d95d4ec..5355a7fe5ab 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -136,8 +136,6 @@ #include "qemu/guest-random.h" #include "qemu/keyval.h" -#include "config-host.h" - #define MAX_VIRTIO_CONSOLES 1 typedef struct BlockdevOptionsQueueEntry { diff --git a/tcg/tci.c b/tcg/tci.c index 022fe9d0f85..fc67e7e767a 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -21,7 +21,6 @@ #include "exec/cpu_ldst.h" #include "tcg/tcg-op.h" #include "tcg/tcg-ldst.h" -#include "qemu/compiler.h" #include diff --git a/tests/unit/test-seccomp.c b/tests/unit/test-seccomp.c index 3d7771e46c7..f02c79cafd1 100644 --- a/tests/unit/test-seccomp.c +++ b/tests/unit/test-seccomp.c @@ -25,7 +25,6 @@ #include "qapi/error.h" #include "qemu/module.h" -#include #include static void test_seccomp_helper(const char *args, bool killed, diff --git a/ui/udmabuf.c b/ui/udmabuf.c index cebceb26100..cbf4357bb1c 100644 --- a/ui/udmabuf.c +++ b/ui/udmabuf.c @@ -8,7 +8,6 @@ #include "qapi/error.h" #include "ui/console.h" -#include #include int udmabuf_fd(void) diff --git a/util/main-loop.c b/util/main-loop.c index 58f776a8c9c..3c0f5251926 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -33,7 +33,6 @@ #include "block/thread-pool.h" #include "qemu/error-report.h" #include "qemu/queue.h" -#include "qemu/compiler.h" #include "qom/object.h" #ifndef _WIN32 diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 59a891b6a83..fd03fd32c87 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -40,7 +40,6 @@ #include "qemu/thread.h" #include #include "qemu/cutils.h" -#include "qemu/compiler.h" #include "qemu/units.h" #include "qemu/thread-context.h" @@ -50,7 +49,6 @@ #ifdef __FreeBSD__ #include -#include #include #include #endif