mbox series

[00/10] Clean up includes

Message ID 20240125163408.1595135-1-peter.maydell@linaro.org
Headers show
Series Clean up includes | expand

Message

Peter Maydell Jan. 25, 2024, 4:33 p.m. UTC 
This series makes a bunch of automated edits with the clean-includes
script. 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.

I created the series by looking at a run of the script across the
whole tree (./scripts/clean-includes --git includes --all) produces,
and then disentangling that into (a) different cohesive parts and (b)
files that needed to go into the script's exclude-list.

After this series, the tree is still not entirely clean -- there
are 20 other files the script wants to change. But at least some
of them are things that should be on the exclude list, and some
are things which I didn't feel like taking the time to try to
decide whether they should be fixed or excluded. I might come
back to these at some later date, but I figured this series was
enough to be going on with.

thanks
-- PMM

Peter Maydell (10):
  scripts/clean-includes: Update exclude list
  hyperv: Clean up includes
  disas/riscv: Clean up includes
  aspeed: Clean up includes
  acpi: Clean up includes
  m68k: Clean up includes
  include: Clean up includes
  cxl: Clean up includes
  riscv: Clean up includes
  misc: Clean up includes

 disas/riscv.h                             | 1 -
 hw/arm/aspeed_eeprom.h                    | 1 -
 hw/hyperv/hv-balloon-internal.h           | 1 -
 hw/hyperv/hv-balloon-our_range_memslots.h | 1 -
 hw/hyperv/hv-balloon-page_range_tree.h    | 1 -
 include/hw/arm/raspberrypi-fw-defs.h      | 1 -
 include/hw/audio/asc.h                    | 1 -
 include/hw/m68k/q800-glue.h               | 1 -
 include/hw/mem/memory-device.h            | 1 -
 include/hw/nvram/fw_cfg_acpi.h            | 1 -
 include/hw/ppc/spapr_nested.h             | 1 -
 include/hw/virtio/virtio-acpi.h           | 1 -
 include/hw/xen/xen-hvm-common.h           | 1 -
 include/qemu/qtree.h                      | 1 -
 include/ui/rect.h                         | 2 --
 target/riscv/vector_internals.h           | 1 -
 tests/qtest/qtest_aspeed.h                | 2 --
 audio/pwaudio.c                           | 1 -
 disas/riscv-xthead.c                      | 1 +
 disas/riscv-xventana.c                    | 1 +
 hw/arm/aspeed_eeprom.c                    | 1 +
 hw/cxl/cxl-events.c                       | 4 +---
 hw/hyperv/hv-balloon-our_range_memslots.c | 1 +
 hw/hyperv/hv-balloon-page_range_tree.c    | 1 +
 hw/hyperv/hv-balloon.c                    | 1 +
 hw/nvram/fw_cfg-acpi.c                    | 1 +
 hw/virtio/virtio-acpi.c                   | 1 +
 net/af-xdp.c                              | 1 -
 plugins/core.c                            | 1 -
 plugins/loader.c                          | 1 -
 target/riscv/vector_internals.c           | 1 +
 util/userfaultfd.c                        | 1 -
 scripts/clean-includes                    | 2 +-
 33 files changed, 11 insertions(+), 28 deletions(-)

Comments

Michael Tokarev Jan. 27, 2024, 5:53 a.m. UTC | #1 
25.01.2024 19:33, Peter Maydell :
> This series makes a bunch of automated edits with the clean-includes
> script. 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.
> 
> I created the series by looking at a run of the script across the
> whole tree (./scripts/clean-includes --git includes --all) produces,
> and then disentangling that into (a) different cohesive parts and (b)
> files that needed to go into the script's exclude-list.
> 
> After this series, the tree is still not entirely clean -- there
> are 20 other files the script wants to change. But at least some
> of them are things that should be on the exclude list, and some
> are things which I didn't feel like taking the time to try to
> decide whether they should be fixed or excluded. I might come
> back to these at some later date, but I figured this series was
> enough to be going on with.
> 
> thanks
> -- PMM
> 
> Peter Maydell (10):
>    scripts/clean-includes: Update exclude list
>    hyperv: Clean up includes
>    disas/riscv: Clean up includes
>    aspeed: Clean up includes
>    acpi: Clean up includes
>    m68k: Clean up includes
>    include: Clean up includes
>    cxl: Clean up includes
>    riscv: Clean up includes
>    misc: Clean up includes

Applied to trivial-patches tree, thanks!

/mjt