Re: [Qemu-devel] [PATCH 00/14] More #include cleanups

[Eric Blake]

On 02/09/2016 08:24 AM, Peter Maydell wrote:
> This set of patches does a bunch more cleaning of includes.
> Specifically it does everything necessary to be able to
> remove osdep.h includes from header files including qemu-common.h
> 
> Most of these patches are small, except for the one which
> deals with tests/ (that one has already been reviewed).
> There are several patches which fix code generators to
> generate correct #includes, and some which do manual changes
> to C++ or other files that Coccinelle barfs on.
> 
> The "all:" patch is running clean-includes on the whole
> tree to pick up some new files which have been added
> recently (mostly via target-arm).
> 
> I've thrown in a couple of patches that have already appeared
> on list, just to get the whole set into one series.
> 
> I have some pending patches which:
>  * enhance clean-includes to handle header files
>  * clean up header files
>  * add a --all option to clean-includes to do a "run clean
>    on whole tree"
> 
> but I'd like to get the "add missing includes to .c files"
> parts into master before moving onto "remove includes from .h
> files" part...

Reviewed-by: Eric Blake <address@hidden>

> 
> thanks
> -- PMM
> 
> Eric Blake (1):
>   qapi: Clean up includes in generated files
> 
> Peter Maydell (13):
>   cpu: Clean up includes
>   ui/cocoa.m: Include qemu/osdep.h
>   disas/arm-a64.cc: Include osdep.h first
>   hw/block/nand.c: Include osdep.h first
>   target-cris: Remove unnecessary ifdef from mmu.c
>   cris: Clean up includes
>   libdecnumber: Clean up includes
>   tests/i440fx-test: Don't define ARRAY_SIZE locally
>   tests: Clean up includes
>   scripts/feature_to_c.sh: Include qemu/osdep.h rather than config.h
>   scripts/tracetool: Include qemu/osdep.h in generated .c files
>   all: Clean up includes
>   oslib-posix.c: Move workaround for OSX daemon() deprecation to osdep.h
> 
>  disas/arm-a64.cc                         |  5 +++--
>  hw/arm/bcm2835_peripherals.c             |  1 +
>  hw/arm/bcm2836.c                         |  1 +
>  hw/arm/raspi.c                           |  1 +
>  hw/block/nand.c                          |  5 +++--
>  hw/intc/bcm2835_ic.c                     |  1 +
>  hw/intc/bcm2836_control.c                |  1 +
>  hw/misc/bcm2835_mbox.c                   |  1 +
>  hw/misc/bcm2835_property.c               |  1 +
>  include/qemu/osdep.h                     | 11 +++++++++++
>  libdecnumber/decContext.c                |  3 +--
>  libdecnumber/decNumber.c                 |  5 +----
>  libdecnumber/dpd/decimal128.c            |  3 +--
>  libdecnumber/dpd/decimal32.c             |  3 +--
>  libdecnumber/dpd/decimal64.c             |  3 +--
>  qom/cpu.c                                |  1 +
>  scripts/feature_to_c.sh                  |  2 +-
>  scripts/qapi-commands.py                 |  1 +
>  scripts/qapi-event.py                    |  1 +
>  scripts/qapi-introspect.py               |  3 ++-
>  scripts/qapi-types.py                    |  3 +--
>  scripts/qapi-visit.py                    |  1 +
>  scripts/tracetool/backend/simple.py      |  3 ++-
>  scripts/tracetool/format/events_c.py     |  1 +
>  scripts/tracetool/format/tcg_helper_c.py |  1 +
>  stubs/blockdev-close-all-bdrv-states.c   |  1 +
>  target-cris/mmu.c                        |  4 +---
>  target-i386/cpu.c                        |  5 +----
>  tests/ac97-test.c                        |  3 +--
>  tests/bios-tables-test.c                 |  4 +---
>  tests/boot-order-test.c                  |  2 +-
>  tests/check-qdict.c                      |  1 +
>  tests/check-qfloat.c                     |  1 +
>  tests/check-qint.c                       |  1 +
>  tests/check-qjson.c                      |  1 +
>  tests/check-qlist.c                      |  1 +
>  tests/check-qom-interface.c              |  1 +
>  tests/check-qom-proplist.c               |  1 +
>  tests/check-qstring.c                    |  1 +
>  tests/crypto-tls-x509-helpers.c          |  4 +---
>  tests/device-introspect-test.c           |  2 +-
>  tests/display-vga-test.c                 |  3 +--
>  tests/drive_del-test.c                   |  2 +-
>  tests/ds1338-test.c                      |  1 +
>  tests/e1000-test.c                       |  3 +--
>  tests/eepro100-test.c                    |  3 +--
>  tests/endianness-test.c                  |  5 +----
>  tests/es1370-test.c                      |  3 +--
>  tests/fdc-test.c                         |  4 +---
>  tests/fw_cfg-test.c                      |  2 +-
>  tests/hd-geo-test.c                      |  4 +---
>  tests/i440fx-test.c                      |  8 +-------
>  tests/i82801b11-test.c                   |  3 +--
>  tests/intel-hda-test.c                   |  3 +--
>  tests/io-channel-helpers.c               |  1 +
>  tests/ioh3420-test.c                     |  3 +--
>  tests/ipmi-bt-test.c                     |  5 +----
>  tests/ipmi-kcs-test.c                    |  4 +---
>  tests/ipoctal232-test.c                  |  3 +--
>  tests/ivshmem-test.c                     |  6 +-----
>  tests/libqos/fw_cfg.c                    |  1 +
>  tests/libqos/i2c-imx.c                   |  3 +--
>  tests/libqos/i2c-omap.c                  |  3 +--
>  tests/libqos/i2c.c                       |  1 +
>  tests/libqos/libqos-pc.c                 |  1 +
>  tests/libqos/libqos.c                    |  6 +-----
>  tests/libqos/malloc-generic.c            |  1 +
>  tests/libqos/malloc-pc.c                 |  1 +
>  tests/libqos/malloc.c                    |  3 +--
>  tests/libqos/pci-pc.c                    |  1 +
>  tests/libqos/pci.c                       |  1 +
>  tests/libqos/usb.c                       |  3 +--
>  tests/libqos/virtio-mmio.c               |  2 +-
>  tests/libqos/virtio-pci.c                |  2 +-
>  tests/libqos/virtio.c                    |  1 +
>  tests/libqtest.c                         | 12 ++----------
>  tests/m48t59-test.c                      |  5 +----
>  tests/ne2000-test.c                      |  3 +--
>  tests/nvme-test.c                        |  3 +--
>  tests/pc-cpu-test.c                      |  3 +--
>  tests/pcnet-test.c                       |  3 +--
>  tests/pkix_asn1_tab.c                    |  1 +
>  tests/pvpanic-test.c                     |  3 +--
>  tests/q35-test.c                         |  3 +--
>  tests/qemu-iotests/socket_scm_helper.c   |  8 +-------
>  tests/qom-test.c                         |  3 +--
>  tests/rcutorture.c                       |  5 +----
>  tests/rtc-test.c                         |  5 +----
>  tests/rtl8139-test.c                     |  3 +--
>  tests/spapr-phb-test.c                   |  1 +
>  tests/tco-test.c                         |  4 +---
>  tests/test-aio.c                         |  1 +
>  tests/test-base64.c                      |  1 +
>  tests/test-bitops.c                      |  3 +--
>  tests/test-blockjob-txn.c                |  2 +-
>  tests/test-coroutine.c                   |  1 +
>  tests/test-crypto-cipher.c               |  1 +
>  tests/test-crypto-hash.c                 |  1 +
>  tests/test-crypto-secret.c               |  1 +
>  tests/test-crypto-tlscredsx509.c         |  4 +---
>  tests/test-crypto-tlssession.c           |  4 +---
>  tests/test-cutils.c                      |  3 +--
>  tests/test-hbitmap.c                     |  4 +---
>  tests/test-int128.c                      |  3 +--
>  tests/test-io-channel-buffer.c           |  1 +
>  tests/test-io-channel-command.c          |  1 +
>  tests/test-io-channel-file.c             |  1 +
>  tests/test-io-channel-socket.c           |  1 +
>  tests/test-io-channel-tls.c              |  4 +---
>  tests/test-io-task.c                     |  1 +
>  tests/test-iov.c                         |  1 +
>  tests/test-mul64.c                       |  3 +--
>  tests/test-netfilter.c                   |  1 +
>  tests/test-opts-visitor.c                |  1 +
>  tests/test-qdev-global-props.c           |  2 +-
>  tests/test-qemu-opts.c                   |  3 +--
>  tests/test-qga.c                         |  9 +--------
>  tests/test-qmp-commands.c                |  1 +
>  tests/test-qmp-event.c                   |  2 +-
>  tests/test-qmp-input-strict.c            |  2 +-
>  tests/test-qmp-input-visitor.c           |  2 +-
>  tests/test-qmp-output-visitor.c          |  1 +
>  tests/test-rcu-list.c                    |  6 +-----
>  tests/test-rfifolock.c                   |  1 +
>  tests/test-string-input-visitor.c        |  2 +-
>  tests/test-string-output-visitor.c       |  1 +
>  tests/test-thread-pool.c                 |  1 +
>  tests/test-throttle.c                    |  1 +
>  tests/test-timed-average.c               |  2 +-
>  tests/test-visitor-serialization.c       |  3 +--
>  tests/test-vmstate.c                     |  1 +
>  tests/test-write-threshold.c             |  2 +-
>  tests/test-x86-cpuid.c                   |  1 +
>  tests/test-xbzrle.c                      |  6 +-----
>  tests/tmp105-test.c                      |  1 +
>  tests/tpci200-test.c                     |  3 +--
>  tests/vhost-user-bridge.c                | 12 +-----------
>  tests/vhost-user-test.c                  |  1 +
>  tests/virtio-balloon-test.c              |  3 +--
>  tests/virtio-blk-test.c                  |  5 +----
>  tests/virtio-console-test.c              |  3 +--
>  tests/virtio-net-test.c                  |  3 +--
>  tests/virtio-rng-test.c                  |  3 +--
>  tests/virtio-scsi-test.c                 |  4 +---
>  tests/virtio-serial-test.c               |  3 +--
>  tests/vmxnet3-test.c                     |  3 +--
>  tests/wdt_ib700-test.c                   |  3 +--
>  ui/cocoa.m                               |  2 ++
>  util/oslib-posix.c                       |  9 ---------
>  149 files changed, 166 insertions(+), 241 deletions(-)
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

signature.asc
Description: OpenPGP digital signature