Skip to content

Commit

Permalink
Include qemu/main-loop.h less
Browse files Browse the repository at this point in the history 
In my "build everything" tree, changing qemu/main-loop.h triggers a
recompile of some 5600 out of 6600 objects (not counting tests and
objects that don't depend on qemu/osdep.h).  It includes block/aio.h,
which in turn includes qemu/event_notifier.h, qemu/notify.h,
qemu/processor.h, qemu/qsp.h, qemu/queue.h, qemu/thread-posix.h,
qemu/thread.h, qemu/timer.h, and a few more.

Include qemu/main-loop.h only where it's needed.  Touching it now
recompiles only some 1700 objects.  For block/aio.h and
qemu/event_notifier.h, these numbers drop from 5600 to 2800.  For the
others, they shrink only slightly.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190812052359.30071-21-armbru@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
  • Loading branch information
Markus Armbruster committed Aug 16, 2019
1 parent dc5e9ac commit db72581
Show file tree
Hide file tree
Showing 129 changed files with 130 additions and 8 deletions.
1 change: 1 addition & 0 deletions accel/kvm/kvm-all.c
View file
Expand Up @@ -34,6 +34,7 @@
#include "exec/ram_addr.h"
#include "exec/address-spaces.h"
#include "qemu/event_notifier.h"
#include "qemu/main-loop.h"
#include "trace.h"
#include "hw/irq.h"
#include "sysemu/sev.h"
Expand Down
1 change: 1 addition & 0 deletions block.c
View file
Expand Up @@ -30,6 +30,7 @@
#include "block/qdict.h"
#include "qemu/error-report.h"
#include "module_block.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qapi/error.h"
#include "qapi/qmp/qdict.h"
Expand Down
1 change: 1 addition & 0 deletions block/block-backend.c
View file
Expand Up @@ -21,6 +21,7 @@
#include "qapi/error.h"
#include "qapi/qapi-events-block.h"
#include "qemu/id.h"
#include "qemu/main-loop.h"
#include "qemu/option.h"
#include "trace.h"
#include "migration/misc.h"
Expand Down
1 change: 1 addition & 0 deletions block/create.c
View file
Expand Up @@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "block/block_int.h"
#include "qemu/job.h"
#include "qemu/main-loop.h"
#include "qapi/qapi-commands-block-core.h"
#include "qapi/qapi-visit-block-core.h"
#include "qapi/clone-visitor.h"
Expand Down
1 change: 1 addition & 0 deletions block/io.c
View file
Expand Up @@ -32,6 +32,7 @@
#include "qemu/cutils.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"

#define NOT_DONE 0x7fffffff /* used while emulated sync operation in progress */

Expand Down
1 change: 1 addition & 0 deletions block/nbd.c
View file
Expand Up @@ -33,6 +33,7 @@
#include "qemu/uri.h"
#include "qemu/option.h"
#include "qemu/cutils.h"
#include "qemu/main-loop.h"

#include "qapi/qapi-visit-sockets.h"
#include "qapi/qmp/qstring.h"
Expand Down
1 change: 1 addition & 0 deletions block/nfs.c
View file
Expand Up @@ -32,6 +32,7 @@
#include "block/qdict.h"
#include "trace.h"
#include "qemu/iov.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qemu/option.h"
#include "qemu/uri.h"
Expand Down
1 change: 1 addition & 0 deletions block/nvme.c
View file
Expand Up @@ -17,6 +17,7 @@
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qstring.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qemu/cutils.h"
#include "qemu/option.h"
Expand Down
1 change: 1 addition & 0 deletions block/qcow2.c
View file
Expand Up @@ -26,6 +26,7 @@

#include "block/qdict.h"
#include "sysemu/block-backend.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qcow2.h"
#include "qemu/error-report.h"
Expand Down
1 change: 1 addition & 0 deletions block/qed.c
View file
Expand Up @@ -17,6 +17,7 @@
#include "qapi/error.h"
#include "qemu/timer.h"
#include "qemu/bswap.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qemu/option.h"
#include "trace.h"
Expand Down
1 change: 1 addition & 0 deletions block/sheepdog.c
View file
Expand Up @@ -22,6 +22,7 @@
#include "qapi/qobject-output-visitor.h"
#include "qemu/uri.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qemu/option.h"
#include "qemu/sockets.h"
Expand Down
1 change: 1 addition & 0 deletions block/throttle-groups.c
View file
Expand Up @@ -26,6 +26,7 @@
#include "sysemu/block-backend.h"
#include "block/throttle-groups.h"
#include "qemu/throttle-options.h"
#include "qemu/main-loop.h"
#include "qemu/queue.h"
#include "qemu/thread.h"
#include "sysemu/qtest.h"
Expand Down
1 change: 1 addition & 0 deletions blockdev.c
View file
Expand Up @@ -60,6 +60,7 @@
#include "sysemu/qtest.h"
#include "qemu/cutils.h"
#include "qemu/help_option.h"
#include "qemu/main-loop.h"
#include "qemu/throttle-options.h"

static QTAILQ_HEAD(, BlockDriverState) monitor_bdrv_states =
Expand Down
1 change: 1 addition & 0 deletions blockjob.c
View file
Expand Up @@ -33,6 +33,7 @@
#include "qapi/qapi-events-block-core.h"
#include "qapi/qmp/qerror.h"
#include "qemu/coroutine.h"
#include "qemu/main-loop.h"
#include "qemu/timer.h"

/*
Expand Down
1 change: 1 addition & 0 deletions chardev/baum.c
View file
Expand Up @@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "chardev/char.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qemu/timer.h"
#include "hw/usb.h"
Expand Down
1 change: 1 addition & 0 deletions chardev/char-pipe.c
View file
Expand Up @@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qemu/option.h"
#include "chardev/char.h"
Expand Down
1 change: 1 addition & 0 deletions chardev/char-win-stdio.c
View file
Expand Up @@ -24,6 +24,7 @@

#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "chardev/char-win.h"
#include "chardev/char-win-stdio.h"
Expand Down
1 change: 1 addition & 0 deletions chardev/char-win.c
View file
Expand Up @@ -23,6 +23,7 @@
*/

#include "qemu/osdep.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qapi/error.h"
#include "chardev/char-win.h"
Expand Down
1 change: 1 addition & 0 deletions dump/dump.c
View file
Expand Up @@ -28,6 +28,7 @@
#include "qapi/qapi-events-dump.h"
#include "qapi/qmp/qerror.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "hw/misc/vmcoreinfo.h"

#ifdef TARGET_X86_64
Expand Down
1 change: 1 addition & 0 deletions fsdev/qemu-fsdev-throttle.c
View file
Expand Up @@ -16,6 +16,7 @@
#include "qemu/error-report.h"
#include "qemu-fsdev-throttle.h"
#include "qemu/iov.h"
#include "qemu/main-loop.h"
#include "qemu/option.h"

static void fsdev_throttle_read_timer_cb(void *opaque)
Expand Down
1 change: 0 additions & 1 deletion fsdev/qemu-fsdev-throttle.h
View file
Expand Up @@ -16,7 +16,6 @@
#define QEMU_FSDEV_THROTTLE_H

#include "block/aio.h"
#include "qemu/main-loop.h"
#include "qemu/coroutine.h"
#include "qemu/throttle.h"

Expand Down
1 change: 1 addition & 0 deletions hw/9pfs/9p.c
View file
Expand Up @@ -17,6 +17,7 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/iov.h"
#include "qemu/main-loop.h"
#include "qemu/sockets.h"
#include "virtio-9p.h"
#include "fsdev/qemu-fsdev.h"
Expand Down
1 change: 1 addition & 0 deletions hw/9pfs/codir.c
View file
Expand Up @@ -15,6 +15,7 @@
#include "fsdev/qemu-fsdev.h"
#include "qemu/thread.h"
#include "qemu/coroutine.h"
#include "qemu/main-loop.h"
#include "coth.h"

int coroutine_fn v9fs_co_readdir(V9fsPDU *pdu, V9fsFidState *fidp,
Expand Down
1 change: 1 addition & 0 deletions hw/9pfs/cofile.c
View file
Expand Up @@ -15,6 +15,7 @@
#include "fsdev/qemu-fsdev.h"
#include "qemu/thread.h"
#include "qemu/coroutine.h"
#include "qemu/main-loop.h"
#include "coth.h"

int coroutine_fn v9fs_co_st_gen(V9fsPDU *pdu, V9fsPath *path, mode_t st_mode,
Expand Down
1 change: 1 addition & 0 deletions hw/9pfs/cofs.c
View file
Expand Up @@ -15,6 +15,7 @@
#include "fsdev/qemu-fsdev.h"
#include "qemu/thread.h"
#include "qemu/coroutine.h"
#include "qemu/main-loop.h"
#include "coth.h"

static ssize_t __readlink(V9fsState *s, V9fsPath *path, V9fsString *buf)
Expand Down
1 change: 1 addition & 0 deletions hw/9pfs/coth.c
View file
Expand Up @@ -15,6 +15,7 @@
#include "qemu/osdep.h"
#include "block/thread-pool.h"
#include "qemu/coroutine.h"
#include "qemu/main-loop.h"
#include "coth.h"

/* Called from QEMU I/O thread. */
Expand Down
1 change: 0 additions & 1 deletion hw/9pfs/coth.h
View file
Expand Up @@ -17,7 +17,6 @@

#include "qemu/thread.h"
#include "qemu/coroutine.h"
#include "qemu/main-loop.h"
#include "9p.h"

/*
Expand Down
1 change: 1 addition & 0 deletions hw/9pfs/coxattr.c
View file
Expand Up @@ -15,6 +15,7 @@
#include "fsdev/qemu-fsdev.h"
#include "qemu/thread.h"
#include "qemu/coroutine.h"
#include "qemu/main-loop.h"
#include "coth.h"

int coroutine_fn v9fs_co_llistxattr(V9fsPDU *pdu, V9fsPath *path, void *value,
Expand Down
1 change: 1 addition & 0 deletions hw/9pfs/xen-9p-backend.c
View file
Expand Up @@ -15,6 +15,7 @@
#include "hw/9pfs/xen-9pfs.h"
#include "qapi/error.h"
#include "qemu/config-file.h"
#include "qemu/main-loop.h"
#include "qemu/option.h"
#include "fsdev/qemu-fsdev.h"

Expand Down
1 change: 1 addition & 0 deletions hw/arm/omap1.c
View file
Expand Up @@ -19,6 +19,7 @@

#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
Expand Down
1 change: 1 addition & 0 deletions hw/block/dataplane/virtio-blk.c
View file
Expand Up @@ -16,6 +16,7 @@
#include "qapi/error.h"
#include "trace.h"
#include "qemu/iov.h"
#include "qemu/main-loop.h"
#include "qemu/thread.h"
#include "qemu/error-report.h"
#include "hw/virtio/virtio-access.h"
Expand Down
1 change: 1 addition & 0 deletions hw/block/dataplane/xen-block.c
View file
Expand Up @@ -20,6 +20,7 @@

#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qapi/error.h"
#include "hw/xen/xen_common.h"
#include "hw/block/xen_blkif.h"
Expand Down
1 change: 1 addition & 0 deletions hw/block/fdc.c
View file
Expand Up @@ -41,6 +41,7 @@
#include "sysemu/blockdev.h"
#include "sysemu/sysemu.h"
#include "qemu/log.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "trace.h"

Expand Down
1 change: 1 addition & 0 deletions hw/block/xen-block.c
View file
Expand Up @@ -7,6 +7,7 @@

#include "qemu/osdep.h"
#include "qemu/cutils.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qemu/option.h"
#include "qapi/error.h"
Expand Down
1 change: 1 addition & 0 deletions hw/char/virtio-serial-bus.c
View file
Expand Up @@ -21,6 +21,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/iov.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "migration/qemu-file-types.h"
#include "monitor/monitor.h"
Expand Down
1 change: 1 addition & 0 deletions hw/core/machine-qmp-cmds.c
View file
Expand Up @@ -13,6 +13,7 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-machine.h"
#include "qapi/qmp/qerror.h"
#include "qemu/main-loop.h"
#include "sysemu/hostmem.h"
#include "sysemu/hw_accel.h"
#include "sysemu/numa.h"
Expand Down
1 change: 1 addition & 0 deletions hw/display/qxl.c
View file
Expand Up @@ -26,6 +26,7 @@
#include "qemu/timer.h"
#include "qemu/queue.h"
#include "qemu/atomic.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "sysemu/sysemu.h"
#include "migration/blocker.h"
Expand Down
1 change: 1 addition & 0 deletions hw/dma/etraxfs_dma.c
View file
Expand Up @@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/irq.h"
#include "qemu/main-loop.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"

Expand Down
1 change: 1 addition & 0 deletions hw/i386/intel_iommu.c
View file
Expand Up @@ -21,6 +21,7 @@

#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qapi/error.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
Expand Down
1 change: 1 addition & 0 deletions hw/i386/xen/xen-hvm.c
View file
Expand Up @@ -23,6 +23,7 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-misc.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/range.h"
#include "sysemu/xen-mapcache.h"
#include "trace.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ide/ahci.c
View file
Expand Up @@ -28,6 +28,7 @@

#include "qemu/error-report.h"
#include "qemu/log.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "sysemu/block-backend.h"
#include "sysemu/dma.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ide/core.c
View file
Expand Up @@ -27,6 +27,7 @@
#include "hw/isa/isa.h"
#include "migration/vmstate.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
#include "sysemu/blockdev.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ide/qdev.c
View file
Expand Up @@ -22,6 +22,7 @@
#include "qapi/error.h"
#include "qapi/qapi-types-block.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "hw/ide/internal.h"
#include "sysemu/block-backend.h"
Expand Down
1 change: 1 addition & 0 deletions hw/intc/s390_flic.c
View file
Expand Up @@ -12,6 +12,7 @@

#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "hw/sysbus.h"
#include "hw/s390x/ioinst.h"
Expand Down
1 change: 1 addition & 0 deletions hw/m68k/mcf5206.c
View file
Expand Up @@ -8,6 +8,7 @@

#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "cpu.h"
#include "hw/hw.h"
#include "hw/irq.h"
Expand Down
1 change: 1 addition & 0 deletions hw/m68k/mcf5208.c
View file
Expand Up @@ -9,6 +9,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
Expand Down
1 change: 1 addition & 0 deletions hw/misc/imx6_src.c
View file
Expand Up @@ -14,6 +14,7 @@
#include "sysemu/sysemu.h"
#include "qemu/bitops.h"
#include "qemu/log.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "arm-powerctl.h"
#include "qom/cpu.h"
Expand Down
1 change: 1 addition & 0 deletions hw/net/fsl_etsec/etsec.c
View file
Expand Up @@ -34,6 +34,7 @@
#include "etsec.h"
#include "registers.h"
#include "qemu/log.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"

/* #define HEX_DUMP */
Expand Down
1 change: 1 addition & 0 deletions hw/net/lan9118.c
View file
Expand Up @@ -21,6 +21,7 @@
#include "sysemu/sysemu.h"
#include "hw/ptimer.h"
#include "qemu/log.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
/* For crc32 */
#include <zlib.h>
Expand Down

0 comments on commit db72581

Please sign in to comment.