Alex Bennée <alex.ben...@linaro.org> writes: > Markus Armbruster <arm...@redhat.com> writes: > >> In my "build everything" tree, changing sysemu/sysemu.h triggers a >> recompile of some 1800 out of 6600 objects (not counting tests and >> objects that don't depend on qemu/osdep.h, down from 5400 due to the >> previous commit). >> >> Several headers include sysemu/sysemu.h just to get typedef >> VMChangeStateEntry. Move it from sysemu/sysemu.h to qemu/typedefs.h. >> Spell its structure tag the same while there. >> >> Touching sysemu/sysemu.h now recompiles some 1100 objects. >> qemu/uuid.h also drops from 1800 to 1100, and >> qapi/qapi-types-run-state.h from 5000 to 4400. >> >> Signed-off-by: Markus Armbruster <arm...@redhat.com> >> --- >> hw/block/vhost-user-blk.c | 1 + >> hw/block/virtio-blk.c | 1 + >> hw/display/virtio-gpu.c | 1 + >> hw/misc/macio/macio.c | 1 + >> hw/net/virtio-net.c | 1 + >> hw/s390x/s390-ccw.c | 1 + >> hw/s390x/s390-virtio-ccw.c | 1 + >> hw/scsi/scsi-bus.c | 1 + >> hw/scsi/vhost-scsi.c | 1 + >> hw/scsi/vhost-user-scsi.c | 1 + >> hw/usb/hcd-ehci.c | 1 + >> hw/usb/hcd-ehci.h | 1 - >> hw/virtio/virtio-rng.c | 1 + >> hw/virtio/virtio.c | 1 + >> include/hw/ide/internal.h | 3 ++- >> include/hw/ppc/spapr_xive.h | 1 - >> include/hw/scsi/scsi.h | 1 - >> include/hw/virtio/virtio.h | 1 - >> include/qemu/typedefs.h | 1 + >> include/sysemu/sysemu.h | 1 - >> vl.c | 6 +++--- >> 21 files changed, 19 insertions(+), 9 deletions(-) >> >> diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c >> index 7b44cca6d9..6b6cd07362 100644 >> --- a/hw/block/vhost-user-blk.c >> +++ b/hw/block/vhost-user-blk.c >> @@ -28,6 +28,7 @@ >> #include "hw/virtio/virtio.h" >> #include "hw/virtio/virtio-bus.h" >> #include "hw/virtio/virtio-access.h" >> +#include "sysemu/sysemu.h" >> >> static const int user_feature_bits[] = { >> VIRTIO_BLK_F_SIZE_MAX, >> diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c >> index 8cc2a232e0..78ac371eba 100644 >> --- a/hw/block/virtio-blk.c >> +++ b/hw/block/virtio-blk.c >> @@ -20,6 +20,7 @@ >> #include "hw/block/block.h" >> #include "hw/qdev-properties.h" >> #include "sysemu/blockdev.h" >> +#include "sysemu/sysemu.h" >> #include "hw/virtio/virtio-blk.h" >> #include "dataplane/virtio-blk.h" >> #include "scsi/constants.h" >> diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c >> index 6de9689a30..28e868c021 100644 >> --- a/hw/display/virtio-gpu.c >> +++ b/hw/display/virtio-gpu.c >> @@ -17,6 +17,7 @@ >> #include "ui/console.h" >> #include "trace.h" >> #include "sysemu/dma.h" >> +#include "sysemu/sysemu.h" >> #include "hw/virtio/virtio.h" >> #include "migration/qemu-file-types.h" >> #include "hw/virtio/virtio-gpu.h" >> diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c >> index b59df4e3b8..50f20d8206 100644 >> --- a/hw/misc/macio/macio.c >> +++ b/hw/misc/macio/macio.c >> @@ -35,6 +35,7 @@ >> #include "hw/char/escc.h" >> #include "hw/misc/macio/macio.h" >> #include "hw/intc/heathrow_pic.h" >> +#include "sysemu/sysemu.h" >> #include "trace.h" >> >> /* Note: this code is strongly inspirated from the corresponding code >> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c >> index 4113729fcf..9f11422337 100644 >> --- a/hw/net/virtio-net.c >> +++ b/hw/net/virtio-net.c >> @@ -31,6 +31,7 @@ >> #include "hw/virtio/virtio-access.h" >> #include "migration/misc.h" >> #include "standard-headers/linux/ethtool.h" >> +#include "sysemu/sysemu.h" >> #include "trace.h" >> >> #define VIRTIO_NET_VM_VERSION 11 >> diff --git a/hw/s390x/s390-ccw.c b/hw/s390x/s390-ccw.c >> index 22c6878b84..0c5a5b60bd 100644 >> --- a/hw/s390x/s390-ccw.c >> +++ b/hw/s390x/s390-ccw.c >> @@ -19,6 +19,7 @@ >> #include "hw/s390x/css.h" >> #include "hw/s390x/css-bridge.h" >> #include "hw/s390x/s390-ccw.h" >> +#include "sysemu/sysemu.h" >> >> IOInstEnding s390_ccw_cmd_request(SubchDev *sch) >> { >> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c >> index a543b64e56..434d933ec9 100644 >> --- a/hw/s390x/s390-virtio-ccw.c >> +++ b/hw/s390x/s390-virtio-ccw.c >> @@ -40,6 +40,7 @@ >> #include "hw/nmi.h" >> #include "hw/qdev-properties.h" >> #include "hw/s390x/tod.h" >> +#include "sysemu/sysemu.h" >> >> S390CPU *s390_cpu_addr2state(uint16_t cpu_addr) >> { >> diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c >> index db785e6001..cb8e8d1f36 100644 >> --- a/hw/scsi/scsi-bus.c >> +++ b/hw/scsi/scsi-bus.c >> @@ -10,6 +10,7 @@ >> #include "scsi/constants.h" >> #include "sysemu/block-backend.h" >> #include "sysemu/blockdev.h" >> +#include "sysemu/sysemu.h" >> #include "trace.h" >> #include "sysemu/dma.h" >> #include "qemu/cutils.h" >> diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c >> index cd5cf1679d..c693fc748a 100644 >> --- a/hw/scsi/vhost-scsi.c >> +++ b/hw/scsi/vhost-scsi.c >> @@ -30,6 +30,7 @@ >> #include "hw/fw-path-provider.h" >> #include "hw/qdev-properties.h" >> #include "qemu/cutils.h" >> +#include "sysemu/sysemu.h" >> >> /* Features supported by host kernel. */ >> static const int kernel_feature_bits[] = { >> diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c >> index a5be128b54..31c9d34637 100644 >> --- a/hw/scsi/vhost-user-scsi.c >> +++ b/hw/scsi/vhost-user-scsi.c >> @@ -28,6 +28,7 @@ >> #include "hw/virtio/virtio.h" >> #include "hw/virtio/virtio-access.h" >> #include "chardev/char-fe.h" >> +#include "sysemu/sysemu.h" >> >> /* Features supported by the host application */ >> static const int user_feature_bits[] = { >> diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c >> index d7d1ecd45d..e76c939751 100644 >> --- a/hw/usb/hcd-ehci.c >> +++ b/hw/usb/hcd-ehci.c >> @@ -35,6 +35,7 @@ >> #include "trace.h" >> #include "qemu/error-report.h" >> #include "qemu/main-loop.h" >> +#include "sysemu/sysemu.h" >> >> #define FRAME_TIMER_FREQ 1000 >> #define FRAME_TIMER_NS (NANOSECONDS_PER_SECOND / FRAME_TIMER_FREQ) >> diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h >> index fdbcfdcbeb..0298238f0b 100644 >> --- a/hw/usb/hcd-ehci.h >> +++ b/hw/usb/hcd-ehci.h >> @@ -21,7 +21,6 @@ >> #include "qemu/timer.h" >> #include "hw/usb.h" >> #include "sysemu/dma.h" >> -#include "sysemu/sysemu.h" >> #include "hw/pci/pci.h" >> #include "hw/sysbus.h" >> >> diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c >> index 34b4619fd3..c9c2414b7b 100644 >> --- a/hw/virtio/virtio-rng.c >> +++ b/hw/virtio/virtio-rng.c >> @@ -17,6 +17,7 @@ >> #include "hw/qdev-properties.h" >> #include "hw/virtio/virtio-rng.h" >> #include "sysemu/rng.h" >> +#include "sysemu/sysemu.h" >> #include "qom/object_interfaces.h" >> #include "trace.h" >> >> diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c >> index 721dcccc96..0ce142bc04 100644 >> --- a/hw/virtio/virtio.c >> +++ b/hw/virtio/virtio.c >> @@ -26,6 +26,7 @@ >> #include "hw/qdev-properties.h" >> #include "hw/virtio/virtio-access.h" >> #include "sysemu/dma.h" >> +#include "sysemu/sysemu.h" > > I'm confused - why do these now need to include sysemu.h if the only > change to sysemu.h is to drop: > > typedef struct vm_change_state_entry VMChangeStateEntry; > > in favour of the typedefs header?
The patch drops #include "sysemu/sysemu.h" from headers that only need VMChangeStateEntry. A bunch of .c that need more no longer get it from these headers, and need to be patched up. I'll amend the commit message to spell this out more clearly.