Re: [PATCH v4 17/19] Don't include headers already included by qemu/osdep.h
On Thursday, January 19, 2023 7:59:57 AM CET Markus Armbruster wrote: > This commit was created with scripts/clean-includes. > > Signed-off-by: Markus Armbruster > --- For 9p changes: Acked-by: Christian Schoenebeck > backends/tpm/tpm_ioctl.h | 2 -- > fsdev/p9array.h | 2 -- > include/hw/misc/aspeed_lpc.h | 2 -- > include/hw/pci/pcie_doe.h | 1 - > include/qemu/async-teardown.h | 2 -- > include/qemu/dbus.h | 1 - > include/qemu/host-utils.h | 1 - > include/sysemu/event-loop-base.h | 1 - > accel/tcg/cpu-exec.c | 1 - > hw/9pfs/9p.c | 2 -- > hw/display/virtio-gpu-udmabuf.c | 1 - > hw/i2c/pmbus_device.c | 1 - > hw/remote/proxy-memory-listener.c | 1 - > hw/sensor/adm1272.c | 1 - > hw/usb/dev-storage-bot.c | 1 - > hw/usb/dev-storage-classic.c | 1 - > softmmu/vl.c | 2 -- > tcg/tci.c | 1 - > tests/unit/test-seccomp.c | 1 - > ui/udmabuf.c | 1 - > util/main-loop.c | 1 - > util/oslib-posix.c| 2 -- > 22 files changed, 29 deletions(-) > > diff --git a/backends/tpm/tpm_ioctl.h b/backends/tpm/tpm_ioctl.h > index e506ef5160..b1d31768a6 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 90e83a7c7b..50a1b15fe9 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/include/hw/misc/aspeed_lpc.h b/include/hw/misc/aspeed_lpc.h > index fd228731d2..fa398959af 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 ba4d8b03bd..87dc17dcef 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 092e7a37e7..b281da005b 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 08f00dfd53..81d3de8a5a 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 88d476161c..3ce62bf4a5 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 2748bf6ae1..a6c24f1351 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/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c > index 8927092537..dd8f54a415 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/hw/9pfs/9p.c b/hw/9pfs/9p.c > index 072cf67956..9621ec1341 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 8bdf4bac6e..847fa4c0cc 100644 > --- a/hw/display/virtio-gpu-udmabuf.c > +++ b/hw/display/virtio-gpu-udmabuf.c > @@
[PATCH v4 17/19] Don't include headers already included by qemu/osdep.h
This commit was created with scripts/clean-includes. Signed-off-by: Markus Armbruster --- backends/tpm/tpm_ioctl.h | 2 -- fsdev/p9array.h | 2 -- include/hw/misc/aspeed_lpc.h | 2 -- include/hw/pci/pcie_doe.h | 1 - include/qemu/async-teardown.h | 2 -- include/qemu/dbus.h | 1 - include/qemu/host-utils.h | 1 - include/sysemu/event-loop-base.h | 1 - accel/tcg/cpu-exec.c | 1 - hw/9pfs/9p.c | 2 -- hw/display/virtio-gpu-udmabuf.c | 1 - hw/i2c/pmbus_device.c | 1 - hw/remote/proxy-memory-listener.c | 1 - hw/sensor/adm1272.c | 1 - hw/usb/dev-storage-bot.c | 1 - hw/usb/dev-storage-classic.c | 1 - softmmu/vl.c | 2 -- tcg/tci.c | 1 - tests/unit/test-seccomp.c | 1 - ui/udmabuf.c | 1 - util/main-loop.c | 1 - util/oslib-posix.c| 2 -- 22 files changed, 29 deletions(-) diff --git a/backends/tpm/tpm_ioctl.h b/backends/tpm/tpm_ioctl.h index e506ef5160..b1d31768a6 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 90e83a7c7b..50a1b15fe9 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/include/hw/misc/aspeed_lpc.h b/include/hw/misc/aspeed_lpc.h index fd228731d2..fa398959af 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 ba4d8b03bd..87dc17dcef 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 092e7a37e7..b281da005b 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 08f00dfd53..81d3de8a5a 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 88d476161c..3ce62bf4a5 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 2748bf6ae1..a6c24f1351 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/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 8927092537..dd8f54a415 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/hw/9pfs/9p.c b/hw/9pfs/9p.c index 072cf67956..9621ec1341 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 8bdf4bac6e..847fa4c0cc 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 4071a88cfc..c3d6046784 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
