| Message ID | 20240125163408.1595135-6-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Clean up includes | expand |
On 25/1/24 17:34, Peter Maydell wrote: > This commit was created with scripts/clean-includes: > ./scripts/clean-includes --git acpi include/hw/*/*acpi.h hw/*/*acpi.c > > 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 <peter.maydell@linaro.org> > --- > include/hw/nvram/fw_cfg_acpi.h | 1 - > include/hw/virtio/virtio-acpi.h | 1 - > hw/nvram/fw_cfg-acpi.c | 1 + > hw/virtio/virtio-acpi.c | 1 + > 4 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On Thu, Jan 25, 2024 at 04:34:03PM +0000, Peter Maydell wrote: > Date: Thu, 25 Jan 2024 16:34:03 +0000 > From: Peter Maydell <peter.maydell@linaro.org> > Subject: [PATCH 05/10] acpi: Clean up includes > X-Mailer: git-send-email 2.34.1 > > This commit was created with scripts/clean-includes: > ./scripts/clean-includes --git acpi include/hw/*/*acpi.h hw/*/*acpi.c > > 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 <peter.maydell@linaro.org> > --- > include/hw/nvram/fw_cfg_acpi.h | 1 - > include/hw/virtio/virtio-acpi.h | 1 - > hw/nvram/fw_cfg-acpi.c | 1 + > hw/virtio/virtio-acpi.c | 1 + > 4 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Zhao Liu <zhao1.liu@intel.com> > > diff --git a/include/hw/nvram/fw_cfg_acpi.h b/include/hw/nvram/fw_cfg_acpi.h > index b6553d86fcb..b39eb0490ff 100644 > --- a/include/hw/nvram/fw_cfg_acpi.h > +++ b/include/hw/nvram/fw_cfg_acpi.h > @@ -7,7 +7,6 @@ > #ifndef FW_CFG_ACPI_H > #define FW_CFG_ACPI_H > > -#include "qemu/osdep.h" > #include "exec/hwaddr.h" > > void fw_cfg_acpi_dsdt_add(Aml *scope, const MemMapEntry *fw_cfg_memmap); > diff --git a/include/hw/virtio/virtio-acpi.h b/include/hw/virtio/virtio-acpi.h > index 844e102569e..cace2a315f4 100644 > --- a/include/hw/virtio/virtio-acpi.h > +++ b/include/hw/virtio/virtio-acpi.h > @@ -6,7 +6,6 @@ > #ifndef VIRTIO_ACPI_H > #define VIRTIO_ACPI_H > > -#include "qemu/osdep.h" > #include "exec/hwaddr.h" > > void virtio_acpi_dsdt_add(Aml *scope, const hwaddr virtio_mmio_base, > diff --git a/hw/nvram/fw_cfg-acpi.c b/hw/nvram/fw_cfg-acpi.c > index 4e48baeaa01..58cdcd3121c 100644 > --- a/hw/nvram/fw_cfg-acpi.c > +++ b/hw/nvram/fw_cfg-acpi.c > @@ -4,6 +4,7 @@ > * > */ > > +#include "qemu/osdep.h" > #include "hw/nvram/fw_cfg_acpi.h" > #include "hw/acpi/aml-build.h" > > diff --git a/hw/virtio/virtio-acpi.c b/hw/virtio/virtio-acpi.c > index e18cb38bdbe..230a6695001 100644 > --- a/hw/virtio/virtio-acpi.c > +++ b/hw/virtio/virtio-acpi.c > @@ -4,6 +4,7 @@ > * > */ > > +#include "qemu/osdep.h" > #include "hw/virtio/virtio-acpi.h" > #include "hw/acpi/aml-build.h" > > -- > 2.34.1 > >
On 1/26/24 02:34, Peter Maydell wrote: > This commit was created with scripts/clean-includes: > ./scripts/clean-includes --git acpi include/hw/*/*acpi.h hw/*/*acpi.c > > 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<peter.maydell@linaro.org> > --- > include/hw/nvram/fw_cfg_acpi.h | 1 - > include/hw/virtio/virtio-acpi.h | 1 - > hw/nvram/fw_cfg-acpi.c | 1 + > hw/virtio/virtio-acpi.c | 1 + > 4 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/include/hw/nvram/fw_cfg_acpi.h b/include/hw/nvram/fw_cfg_acpi.h index b6553d86fcb..b39eb0490ff 100644 --- a/include/hw/nvram/fw_cfg_acpi.h +++ b/include/hw/nvram/fw_cfg_acpi.h @@ -7,7 +7,6 @@ #ifndef FW_CFG_ACPI_H #define FW_CFG_ACPI_H -#include "qemu/osdep.h" #include "exec/hwaddr.h" void fw_cfg_acpi_dsdt_add(Aml *scope, const MemMapEntry *fw_cfg_memmap); diff --git a/include/hw/virtio/virtio-acpi.h b/include/hw/virtio/virtio-acpi.h index 844e102569e..cace2a315f4 100644 --- a/include/hw/virtio/virtio-acpi.h +++ b/include/hw/virtio/virtio-acpi.h @@ -6,7 +6,6 @@ #ifndef VIRTIO_ACPI_H #define VIRTIO_ACPI_H -#include "qemu/osdep.h" #include "exec/hwaddr.h" void virtio_acpi_dsdt_add(Aml *scope, const hwaddr virtio_mmio_base, diff --git a/hw/nvram/fw_cfg-acpi.c b/hw/nvram/fw_cfg-acpi.c index 4e48baeaa01..58cdcd3121c 100644 --- a/hw/nvram/fw_cfg-acpi.c +++ b/hw/nvram/fw_cfg-acpi.c @@ -4,6 +4,7 @@ * */ +#include "qemu/osdep.h" #include "hw/nvram/fw_cfg_acpi.h" #include "hw/acpi/aml-build.h" diff --git a/hw/virtio/virtio-acpi.c b/hw/virtio/virtio-acpi.c index e18cb38bdbe..230a6695001 100644 --- a/hw/virtio/virtio-acpi.c +++ b/hw/virtio/virtio-acpi.c @@ -4,6 +4,7 @@ * */ +#include "qemu/osdep.h" #include "hw/virtio/virtio-acpi.h" #include "hw/acpi/aml-build.h"
This commit was created with scripts/clean-includes: ./scripts/clean-includes --git acpi include/hw/*/*acpi.h hw/*/*acpi.c 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 <peter.maydell@linaro.org> --- include/hw/nvram/fw_cfg_acpi.h | 1 - include/hw/virtio/virtio-acpi.h | 1 - hw/nvram/fw_cfg-acpi.c | 1 + hw/virtio/virtio-acpi.c | 1 + 4 files changed, 2 insertions(+), 2 deletions(-)