commit a27bd6c779badb8d76e4430d810ef710a1b98f4e
author Markus Armbruster <armbru@redhat.com> Mon Aug 12 07:23:51 2019 +0200
committer Markus Armbruster <armbru@redhat.com> Fri Aug 16 13:31:53 2019 +0200
tree b7631b26b400537ff383b13e9e9deb299cef85b4
parent db725815985654007ade0fd53590d613fd657208

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>

hw/cpu/a15mpcore.c

diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c
index fc19ed0..7e9983a 100644
--- a/hw/cpu/a15mpcore.c
+++ b/hw/cpu/a15mpcore.c
@@ -23,6 +23,7 @@
 #include "qemu/module.h"
 #include "hw/cpu/a15mpcore.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/kvm.h"
 #include "kvm_arm.h"
 

hw/cpu/a9mpcore.c

diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c
index 9dda4d8..cd1e165 100644
--- a/hw/cpu/a9mpcore.c
+++ b/hw/cpu/a9mpcore.c
@@ -13,6 +13,7 @@
 #include "qemu/module.h"
 #include "hw/cpu/a9mpcore.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "qom/cpu.h"
 
 static void a9mp_priv_set_irq(void *opaque, int irq, int level)

hw/cpu/arm11mpcore.c

diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c
index c611a6f..e78f5d0 100644
--- a/hw/cpu/arm11mpcore.c
+++ b/hw/cpu/arm11mpcore.c
@@ -13,6 +13,7 @@
 #include "hw/cpu/arm11mpcore.h"
 #include "hw/intc/realview_gic.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 
 
 static void mpcore_priv_set_irq(void *opaque, int irq, int level)

hw/cpu/cluster.c

diff --git a/hw/cpu/cluster.c b/hw/cpu/cluster.c
index 6f5f037..74d8d43 100644
--- a/hw/cpu/cluster.c
+++ b/hw/cpu/cluster.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/cpu/cluster.h"
+#include "hw/qdev-properties.h"
 #include "qom/cpu.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

hw/cpu/realview_mpcore.c

diff --git a/hw/cpu/realview_mpcore.c b/hw/cpu/realview_mpcore.c
index 34da446..ae2c991 100644
--- a/hw/cpu/realview_mpcore.c
+++ b/hw/cpu/realview_mpcore.c
@@ -14,6 +14,7 @@
 #include "hw/cpu/arm11mpcore.h"
 #include "hw/intc/realview_gic.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 
 #define TYPE_REALVIEW_MPCORE_RIRQ "realview_mpcore"
 #define REALVIEW_MPCORE_RIRQ(obj) \