Include generated QAPI headers less
commit2ae16a6aa4ce688e2ee25dec3ad2f023bece0b14
authorMarkus Armbruster <armbru@redhat.com>
Mon, 12 Aug 2019 05:23:32 +0000 (12 07:23 +0200)
committerMarkus Armbruster <armbru@redhat.com>
Fri, 16 Aug 2019 11:31:51 +0000 (16 13:31 +0200)
treec522f0f34558a2a4e621216300e812674fb51c17
parentec150c7e09071bcf51bfaa8071fe23efb6df69f7
Include generated QAPI headers less

Some of the generated qapi-types-MODULE.h are included all over the
place.  Changing a QAPI type can trigger massive recompiling.  Top
scorers recompile more than 1000 out of some 6600 objects (not
counting tests and objects that don't depend on qemu/osdep.h):

    6300 qapi/qapi-builtin-types.h
    5700 qapi/qapi-types-run-state.h
    3900 qapi/qapi-types-common.h
    3300 qapi/qapi-types-sockets.h
    3000 qapi/qapi-types-misc.h
    3000 qapi/qapi-types-crypto.h
    3000 qapi/qapi-types-job.h
    3000 qapi/qapi-types-block-core.h
    2800 qapi/qapi-types-block.h
    1300 qapi/qapi-types-net.h

Clean up headers to include generated QAPI headers only where needed.
Impact is negligible except for hw/qdev-properties.h.

This header includes qapi/qapi-types-block.h and
qapi/qapi-types-misc.h.  They are used only in expansions of property
definition macros such as DEFINE_PROP_BLOCKDEV_ON_ERROR() and
DEFINE_PROP_OFF_AUTO().  Moving their inclusion from
hw/qdev-properties.h to the users of these macros avoids pointless
recompiles.  This is how other property definition macros, such as
DEFINE_PROP_NETDEV(), already work.

Improves things for some of the top scorers:

    3600 qapi/qapi-types-common.h
    2800 qapi/qapi-types-sockets.h
     900 qapi/qapi-types-misc.h
    2200 qapi/qapi-types-crypto.h
    2100 qapi/qapi-types-job.h
    2100 qapi/qapi-types-block-core.h
     270 qapi/qapi-types-block.h

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190812052359.30071-3-armbru@redhat.com>
18 files changed:
hw/core/qdev-properties.c
hw/i386/kvm/i8254.c
hw/ide/qdev.c
include/authz/listfile.h
include/block/block.h
include/hw/acpi/acpi_dev_interface.h
include/hw/mem/memory-device.h
include/hw/ppc/spapr_drc.h
include/hw/qdev-properties.h
include/hw/virtio/virtio-pmem.h
include/migration/global_state.h
include/qemu/job.h
include/sysemu/arch_init.h
include/ui/egl-helpers.h
monitor/monitor-internal.h
target/i386/monitor.c
target/i386/sev_i386.h
ui/vnc.h