Re: [Qemu-devel] [PATCH v2 02/29] Include generated QAPI headers less

[Philippe Mathieu-Daudé]

On 8/6/19 5:14 PM, Markus Armbruster wrote:
> 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 <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  hw/core/qdev-properties.c            | 2 ++
>  hw/i386/kvm/i8254.c                  | 1 +
>  hw/ide/qdev.c                        | 1 +
>  include/authz/listfile.h             | 1 -
>  include/block/block.h                | 1 -
>  include/hw/acpi/acpi_dev_interface.h | 1 +
>  include/hw/mem/memory-device.h       | 1 +
>  include/hw/ppc/spapr_drc.h           | 1 -
>  include/hw/qdev-properties.h         | 2 --
>  include/hw/virtio/virtio-pmem.h      | 1 +
>  include/migration/global_state.h     | 1 -
>  include/qemu/job.h                   | 2 +-
>  include/sysemu/arch_init.h           | 1 -
>  include/ui/egl-helpers.h             | 1 -
>  monitor/monitor-internal.h           | 1 -
>  target/i386/monitor.c                | 1 +
>  target/i386/sev_i386.h               | 2 +-
>  ui/vnc.h                             | 1 -
>  18 files changed, 10 insertions(+), 12 deletions(-)
> 
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index 81c97f48a7..8510ad14b0 100644
> --- a/hw/core/qdev-properties.c
> +++ b/hw/core/qdev-properties.c
> @@ -3,6 +3,8 @@
>  #include "hw/qdev.h"
>  #include "qapi/error.h"
>  #include "hw/pci/pci.h"
> +#include "qapi/qapi-types-block.h"
> +#include "qapi/qapi-types-misc.h"
>  #include "qapi/qmp/qerror.h"
>  #include "qemu/ctype.h"
>  #include "qemu/error-report.h"
> diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c
> index c29956ab77..27e36a2abf 100644
> --- a/hw/i386/kvm/i8254.c
> +++ b/hw/i386/kvm/i8254.c
> @@ -25,6 +25,7 @@
>  
>  #include "qemu/osdep.h"
>  #include <linux/kvm.h>
> +#include "qapi/qapi-types-misc.h"
>  #include "qapi/error.h"
>  #include "qemu/module.h"
>  #include "qemu/timer.h"
> diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
> index 9d8502785d..eea22c09f4 100644
> --- a/hw/ide/qdev.c
> +++ b/hw/ide/qdev.c
> @@ -21,6 +21,7 @@
>  #include "hw/hw.h"
>  #include "sysemu/dma.h"
>  #include "qapi/error.h"
> +#include "qapi/qapi-types-block.h"
>  #include "qemu/error-report.h"
>  #include "qemu/module.h"
>  #include "hw/ide/internal.h"
> diff --git a/include/authz/listfile.h b/include/authz/listfile.h
> index 33b728d873..24ae2e606c 100644
> --- a/include/authz/listfile.h
> +++ b/include/authz/listfile.h
> @@ -22,7 +22,6 @@
>  #define QAUTHZ_LISTFILE_H
>  
>  #include "authz/list.h"
> -#include "qapi/qapi-types-authz.h"
>  #include "qemu/filemonitor.h"
>  
>  #define TYPE_QAUTHZ_LIST_FILE "authz-list-file"
> diff --git a/include/block/block.h b/include/block/block.h
> index 50a07c1c33..ae79b70e2d 100644
> --- a/include/block/block.h
> +++ b/include/block/block.h
> @@ -2,7 +2,6 @@
>  #define BLOCK_H
>  
>  #include "block/aio.h"
> -#include "qapi/qapi-types-block-core.h"
>  #include "block/aio-wait.h"
>  #include "qemu/iov.h"
>  #include "qemu/coroutine.h"
> diff --git a/include/hw/acpi/acpi_dev_interface.h 
> b/include/hw/acpi/acpi_dev_interface.h
> index 43ff119179..6465072b7d 100644
> --- a/include/hw/acpi/acpi_dev_interface.h
> +++ b/include/hw/acpi/acpi_dev_interface.h
> @@ -1,6 +1,7 @@
>  #ifndef ACPI_DEV_INTERFACE_H
>  #define ACPI_DEV_INTERFACE_H
>  
> +#include "qapi/qapi-types-misc.h"
>  #include "qom/object.h"
>  #include "hw/boards.h"
>  
> diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
> index 0293a96abb..2ada6e7bde 100644
> --- a/include/hw/mem/memory-device.h
> +++ b/include/hw/mem/memory-device.h
> @@ -13,6 +13,7 @@
>  #ifndef MEMORY_DEVICE_H
>  #define MEMORY_DEVICE_H
>  
> +#include "qapi/qapi-types-misc.h"
>  #include "qom/object.h"
>  #include "hw/qdev.h"
>  
> diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h
> index c2c543a591..576c711b86 100644
> --- a/include/hw/ppc/spapr_drc.h
> +++ b/include/hw/ppc/spapr_drc.h
> @@ -14,7 +14,6 @@
>  #define HW_SPAPR_DRC_H
>  
>  #include <libfdt.h>
> -#include "qapi/qapi-types-run-state.h"
>  #include "qom/object.h"
>  #include "sysemu/sysemu.h"
>  #include "hw/qdev.h"
> diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
> index 1eae5ab056..bb34a614e2 100644
> --- a/include/hw/qdev-properties.h
> +++ b/include/hw/qdev-properties.h
> @@ -1,8 +1,6 @@
>  #ifndef QEMU_QDEV_PROPERTIES_H
>  #define QEMU_QDEV_PROPERTIES_H
>  
> -#include "qapi/qapi-types-block.h"
> -#include "qapi/qapi-types-misc.h"
>  #include "hw/qdev-core.h"
>  
>  /*** qdev-properties.c ***/
> diff --git a/include/hw/virtio/virtio-pmem.h b/include/hw/virtio/virtio-pmem.h
> index 19b6ee6d75..8bf2ae780f 100644
> --- a/include/hw/virtio/virtio-pmem.h
> +++ b/include/hw/virtio/virtio-pmem.h
> @@ -15,6 +15,7 @@
>  #define HW_VIRTIO_PMEM_H
>  
>  #include "hw/virtio/virtio.h"
> +#include "qapi/qapi-types-misc.h"
>  #include "sysemu/hostmem.h"
>  
>  #define TYPE_VIRTIO_PMEM "virtio-pmem"
> diff --git a/include/migration/global_state.h 
> b/include/migration/global_state.h
> index fd22dd3034..d307de8350 100644
> --- a/include/migration/global_state.h
> +++ b/include/migration/global_state.h
> @@ -13,7 +13,6 @@
>  #ifndef QEMU_MIGRATION_GLOBAL_STATE_H
>  #define QEMU_MIGRATION_GLOBAL_STATE_H
>  
> -#include "qapi/qapi-types-run-state.h"
>  #include "sysemu/sysemu.h"
>  
>  void register_global_state(void);
> diff --git a/include/qemu/job.h b/include/qemu/job.h
> index 9e7cd1e4a0..73c67d3175 100644
> --- a/include/qemu/job.h
> +++ b/include/qemu/job.h
> @@ -26,7 +26,7 @@
>  #ifndef JOB_H
>  #define JOB_H
>  
> -#include "qapi/qapi-types-block-core.h"
> +#include "qapi/qapi-types-job.h"
>  #include "qemu/queue.h"
>  #include "qemu/coroutine.h"
>  #include "block/aio.h"
> diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h
> index 10cbafe970..62c6fe4cf1 100644
> --- a/include/sysemu/arch_init.h
> +++ b/include/sysemu/arch_init.h
> @@ -1,7 +1,6 @@
>  #ifndef QEMU_ARCH_INIT_H
>  #define QEMU_ARCH_INIT_H
>  
> -#include "qapi/qapi-types-misc.h"
>  
>  enum {
>      QEMU_ARCH_ALL = -1,
> diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h
> index 58bd3a1ec4..dad19e9873 100644
> --- a/include/ui/egl-helpers.h
> +++ b/include/ui/egl-helpers.h
> @@ -4,7 +4,6 @@
>  #include <epoxy/gl.h>
>  #include <epoxy/egl.h>
>  #include <gbm.h>
> -#include "qapi/qapi-types-ui.h"
>  #include "ui/console.h"
>  #include "ui/shader.h"
>  
> diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h
> index 7760b22ba3..d78f5ca190 100644
> --- a/monitor/monitor-internal.h
> +++ b/monitor/monitor-internal.h
> @@ -27,7 +27,6 @@
>  
>  #include "chardev/char-fe.h"
>  #include "monitor/monitor.h"
> -#include "qapi/qapi-types-misc.h"
>  #include "qapi/qmp/dispatch.h"
>  #include "qapi/qmp/json-parser.h"
>  #include "qemu/readline.h"
> diff --git a/target/i386/monitor.c b/target/i386/monitor.c
> index 1f3b532fc2..9fb4d641d5 100644
> --- a/target/i386/monitor.c
> +++ b/target/i386/monitor.c
> @@ -33,6 +33,7 @@
>  #include "sysemu/sev.h"
>  #include "qapi/error.h"
>  #include "sev_i386.h"
> +#include "qapi/qapi-commands-misc-target.h"
>  #include "qapi/qapi-commands-misc.h"
>  
>  /* Perform linear address sign extension */
> diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h
> index 55313441ae..8ada9d385d 100644
> --- a/target/i386/sev_i386.h
> +++ b/target/i386/sev_i386.h
> @@ -19,7 +19,7 @@
>  #include "sysemu/kvm.h"
>  #include "sysemu/sev.h"
>  #include "qemu/error-report.h"
> -#include "qapi/qapi-commands-misc-target.h"
> +#include "qapi/qapi-types-misc-target.h"
>  
>  #define SEV_POLICY_NODBG        0x1
>  #define SEV_POLICY_NOKS         0x2
> diff --git a/ui/vnc.h b/ui/vnc.h
> index 2f84db3142..18f1b1d6d0 100644
> --- a/ui/vnc.h
> +++ b/ui/vnc.h
> @@ -27,7 +27,6 @@
>  #ifndef QEMU_VNC_H
>  #define QEMU_VNC_H
>  
> -#include "qapi/qapi-types-ui.h"
>  #include "qemu/queue.h"
>  #include "qemu/thread.h"
>  #include "ui/console.h"
>