This commit was created with scripts/clean-includes: ./scripts/clean-includes --git vfio hw/vfio hw/vfio-user
All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Peter Maydell <[email protected]> Reviewed-by: Cédric Le Goater <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-id: [email protected] --- hw/vfio-user/container.h | 1 - hw/vfio-user/device.h | 1 - hw/vfio/pci-quirks.h | 1 - hw/vfio-user/container.c | 2 +- hw/vfio-user/pci.c | 2 +- hw/vfio/ap.c | 1 - hw/vfio/container.c | 2 +- hw/vfio/cpr-legacy.c | 2 +- 8 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/vfio-user/container.h b/hw/vfio-user/container.h index a2b42e3169d..c952e090631 100644 --- a/hw/vfio-user/container.h +++ b/hw/vfio-user/container.h @@ -7,7 +7,6 @@ #ifndef HW_VFIO_USER_CONTAINER_H #define HW_VFIO_USER_CONTAINER_H -#include "qemu/osdep.h" #include "hw/vfio/vfio-container.h" #include "hw/vfio-user/proxy.h" diff --git a/hw/vfio-user/device.h b/hw/vfio-user/device.h index d183a3950e2..49c05848f1a 100644 --- a/hw/vfio-user/device.h +++ b/hw/vfio-user/device.h @@ -9,7 +9,6 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "qemu/osdep.h" #include "linux/vfio.h" #include "hw/vfio-user/proxy.h" diff --git a/hw/vfio/pci-quirks.h b/hw/vfio/pci-quirks.h index d1532e379b1..a6282e063a1 100644 --- a/hw/vfio/pci-quirks.h +++ b/hw/vfio/pci-quirks.h @@ -12,7 +12,6 @@ #ifndef HW_VFIO_VFIO_PCI_QUIRKS_H #define HW_VFIO_VFIO_PCI_QUIRKS_H -#include "qemu/osdep.h" #include "exec/memop.h" /* diff --git a/hw/vfio-user/container.c b/hw/vfio-user/container.c index e45192fef65..dab7a23224c 100644 --- a/hw/vfio-user/container.c +++ b/hw/vfio-user/container.c @@ -6,9 +6,9 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +#include "qemu/osdep.h" #include <sys/ioctl.h> #include <linux/vfio.h> -#include "qemu/osdep.h" #include "hw/vfio-user/container.h" #include "hw/vfio-user/device.h" diff --git a/hw/vfio-user/pci.c b/hw/vfio-user/pci.c index b53ed3b456f..353d07e7819 100644 --- a/hw/vfio-user/pci.c +++ b/hw/vfio-user/pci.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include <sys/ioctl.h> #include "qemu/osdep.h" +#include <sys/ioctl.h> #include "qapi-visit-sockets.h" #include "qemu/error-report.h" diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index 7719f245797..3368ac89150 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -10,7 +10,6 @@ * directory. */ -#include <stdbool.h> #include "qemu/osdep.h" #include CONFIG_DEVICES /* CONFIG_IOMMUFD */ #include <linux/vfio.h> diff --git a/hw/vfio/container.c b/hw/vfio/container.c index 9ddec300e35..013a691bc5a 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -10,10 +10,10 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +#include "qemu/osdep.h" #include <sys/ioctl.h> #include <linux/vfio.h> -#include "qemu/osdep.h" #include "system/tcg.h" #include "system/ram_addr.h" #include "qapi/error.h" diff --git a/hw/vfio/cpr-legacy.c b/hw/vfio/cpr-legacy.c index 86c943158e2..7c03ddb9610 100644 --- a/hw/vfio/cpr-legacy.c +++ b/hw/vfio/cpr-legacy.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +#include "qemu/osdep.h" #include <sys/ioctl.h> #include <linux/vfio.h> -#include "qemu/osdep.h" #include "hw/vfio/vfio-container-legacy.h" #include "hw/vfio/vfio-device.h" #include "hw/vfio/vfio-listener.h" -- 2.43.0
