Commit a27bd6c7 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

Include hw/qdev-properties.h less 



In my "build everything" tree, changing hw/qdev-properties.h triggers
a recompile of some 2700 out of 6600 objects (not counting tests and
objects that don't depend on qemu/osdep.h).

Many places including hw/qdev-properties.h (directly or via hw/qdev.h)
actually need only hw/qdev-core.h.  Include hw/qdev-core.h there
instead.

hw/qdev.h is actually pointless: all it does is include hw/qdev-core.h
and hw/qdev-properties.h, which in turn includes hw/qdev-core.h.
Replace the remaining uses of hw/qdev.h by hw/qdev-properties.h.

While there, delete a few superfluous inclusions of hw/qdev-core.h.

Touching hw/qdev-properties.h now recompiles some 1200 objects.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <20190812052359.30071-22-armbru@redhat.com>
parent db725815

backends/vhost-user.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 




#include "qemu/osdep.h"

#include "hw/qdev.h"

#include "qapi/error.h"

#include "qapi/qmp/qerror.h"

#include "qemu/error-report.h"

hw/9pfs/virtio-9p-device.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "virtio-9p.h"

#include "fsdev/qemu-fsdev.h"

#include "coth.h"

#include "hw/qdev-properties.h"

#include "hw/virtio/virtio-access.h"

#include "qemu/iov.h"

#include "qemu/module.h"

hw/acpi/piix4.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "hw/isa/apm.h"

#include "hw/i2c/pm_smbus.h"

#include "hw/pci/pci.h"

#include "hw/qdev-properties.h"

#include "hw/acpi/acpi.h"

#include "sysemu/reset.h"

#include "sysemu/sysemu.h"

hw/acpi/vmgenid.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "hw/acpi/aml-build.h"

#include "hw/acpi/vmgenid.h"

#include "hw/nvram/fw_cfg.h"

#include "hw/qdev-properties.h"

#include "migration/vmstate.h"

#include "sysemu/reset.h"

#include "sysemu/sysemu.h"

hw/arm/armv7m.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "hw/sysbus.h"

#include "hw/arm/boot.h"

#include "hw/loader.h"

#include "hw/qdev-properties.h"

#include "elf.h"

#include "sysemu/qtest.h"

#include "sysemu/reset.h"