aboutsummaryrefslogtreecommitdiff
path: root/migration
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2019-08-12 07:23:51 +0200
committerMarkus Armbruster <armbru@redhat.com>2019-08-16 13:31:53 +0200
commita27bd6c779badb8d76e4430d810ef710a1b98f4e (patch)
treeb7631b26b400537ff383b13e9e9deb299cef85b4 /migration
parentdb725815985654007ade0fd53590d613fd657208 (diff)
downloadqemu-arm-a27bd6c779badb8d76e4430d810ef710a1b98f4e.tar.gz
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: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20190812052359.30071-22-armbru@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r--migration/migration.c1
-rw-r--r--migration/migration.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/migration/migration.c b/migration/migration.c
index 85e5d22e32..3a6340f602 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -47,6 +47,7 @@
#include "io/channel-buffer.h"
#include "migration/colo.h"
#include "hw/boards.h"
+#include "hw/qdev-properties.h"
#include "monitor/monitor.h"
#include "net/announce.h"
diff --git a/migration/migration.h b/migration/migration.h
index a7882af67a..b150937180 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -15,10 +15,10 @@
#define QEMU_MIGRATION_H
#include "exec/cpu-common.h"
+#include "hw/qdev-core.h"
#include "qapi/qapi-types-migration.h"
#include "qemu/thread.h"
#include "qemu/coroutine_int.h"
-#include "hw/qdev.h"
#include "io/channel.h"
#include "net/announce.h"