qom: move include files to include/qom/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/qdev-core.h b/hw/qdev-core.h
index 506977c1098998fa490d534be96664911224b0b1..93a3a2a7bcb9c05f094b5fddb221949e47a19870 100644 (file)
--- a/hw/qdev-core.h
+++ b/hw/qdev-core.h
@@ -4,7 +4,7 @@
 #include "qemu-queue.h"
 #include "qemu-option.h"
 #include "qemu-types.h"
-#include "qemu/object.h"
+#include "qom/object.h"
 #include "hw/irq.h"
 #include "qapi/error.h"
 

diff --git a/hw/stream.h b/hw/stream.h
index 21123a9089410974d4aef094ea6633baa6b9f640..f6137d6e258d89a2821c622ac314e9b3b6cf86b9 100644 (file)
--- a/hw/stream.h
+++ b/hw/stream.h
@@ -2,7 +2,7 @@
 #define STREAM_H 1
 
 #include "qemu-common.h"
-#include "qemu/object.h"
+#include "qom/object.h"
 
 /* stream slave. Used until qdev provides a generic way.  */
 #define TYPE_STREAM_SLAVE "stream-slave"

diff --git a/include/qemu/rng-random.h b/include/qemu/rng-random.h
index 6249290cc45f9078269146d84aa3c2c9d2febb11..4332772a24b1ff346f29c6e87eafe5278b9c4964 100644 (file)
--- a/include/qemu/rng-random.h
+++ b/include/qemu/rng-random.h
@@ -12,7 +12,7 @@
 #ifndef QEMU_RNG_RANDOM_H
 #define QEMU_RNG_RANDOM_H
 
-#include "qemu/object.h"
+#include "qom/object.h"
 
 #define TYPE_RNG_RANDOM "rng-random"
 #define RNG_RANDOM(obj) OBJECT_CHECK(RndRandom, (obj), TYPE_RNG_RANDOM)

diff --git a/include/qemu/rng.h b/include/qemu/rng.h
index 37912971e0ecfd53f27787e32cb4dcc61a134fad..509abd023d1d23a3dc778f2c51110d4d282c665c 100644 (file)
--- a/include/qemu/rng.h
+++ b/include/qemu/rng.h
@@ -13,7 +13,7 @@
 #ifndef QEMU_RNG_H
 #define QEMU_RNG_H
 
-#include "qemu/object.h"
+#include "qom/object.h"
 #include "qemu-common.h"
 #include "qapi/error.h"
 

diff --git a/include/qemu/cpu.h b/include/qom/cpu.h
similarity index 99%
rename from include/qemu/cpu.h
rename to include/qom/cpu.h
index 61b76982f1442771e338d22ed43b17b4060b5415..9682dd59edc817a31c9a764810ca404d0f7a5853 100644 (file)
--- a/include/qemu/cpu.h
+++ b/include/qom/cpu.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_CPU_H
 #define QEMU_CPU_H
 
-#include "qemu/object.h"
+#include "qom/object.h"
 #include "qemu-thread.h"
 
 /**

diff --git a/include/qemu/object.h b/include/qom/object.h
similarity index 100%
rename from include/qemu/object.h
rename to include/qom/object.h

diff --git a/include/qemu/qom-qobject.h b/include/qom/qom-qobject.h
similarity index 97%
rename from include/qemu/qom-qobject.h
rename to include/qom/qom-qobject.h
index f9dff12f1179572899e51e9b4958d5b25bc47c72..77cd717e3faf465f40fbcf9fb55ea2a5e1409e6d 100644 (file)
--- a/include/qemu/qom-qobject.h
+++ b/include/qom/qom-qobject.h
@@ -13,7 +13,7 @@
 #ifndef QEMU_QOM_QOBJECT_H
 #define QEMU_QOM_QOBJECT_H
 
-#include "qemu/object.h"
+#include "qom/object.h"
 
 /*
  * object_property_get_qobject:

diff --git a/qmp.c b/qmp.c
index e873f0a0dc211782cad387e3de079d235f185887..5b3a5d7d038a88920686f0682747e66fade8c737 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -23,7 +23,7 @@
 #include "arch_init.h"
 #include "hw/qdev.h"
 #include "blockdev.h"
-#include "qemu/qom-qobject.h"
+#include "qom/qom-qobject.h"
 
 NameInfo *qmp_query_name(Error **errp)
 {

diff --git a/qom/container.c b/qom/container.c
index 4ca8b5cba329aa38399628c72de5a0207ceff8f6..ceb0f0186d20fcb03c36a1b60c83be1d99f2405a 100644 (file)
--- a/qom/container.c
+++ b/qom/container.c
@@ -10,7 +10,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include "qemu/object.h"
+#include "qom/object.h"
 #include "module.h"
 #include <assert.h>
 

diff --git a/qom/cpu.c b/qom/cpu.c
index 5b360469c5aea90fad44db1b455c14c5e62d5a1c..d4d436f80a4c5c9355fbf57bada59f120ac047b3 100644 (file)
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -18,7 +18,7 @@
  * <http://www.gnu.org/licenses/gpl-2.0.html>
  */
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 #include "qemu-common.h"
 
 void cpu_reset(CPUState *cpu)

diff --git a/qom/object.c b/qom/object.c
index 932f8b30de2ef9ce5c6feb1f519ed2af4eb63375..351b88c817b5222e87d8544e8673c02278766b2f 100644 (file)
--- a/qom/object.c
+++ b/qom/object.c
@@ -10,7 +10,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include "qemu/object.h"
+#include "qom/object.h"
 #include "qemu-common.h"
 #include "qapi/visitor.h"
 #include "qapi/string-input-visitor.h"
@@ -19,7 +19,7 @@
 
 /* TODO: replace QObject with a simpler visitor to avoid a dependency
  * of the QOM core on QObject?  */
-#include "qemu/qom-qobject.h"
+#include "qom/qom-qobject.h"
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qint.h"

diff --git a/qom/qom-qobject.c b/qom/qom-qobject.c
index f0fa652157da83572bc0c8056e39f5b65fd6786c..6384b8e98ce316fa534c32b36b602c739482e023 100644 (file)
--- a/qom/qom-qobject.c
+++ b/qom/qom-qobject.c
@@ -10,8 +10,8 @@
  */
 
 #include "qemu-common.h"
-#include "qemu/object.h"
-#include "qemu/qom-qobject.h"
+#include "qom/object.h"
+#include "qom/qom-qobject.h"
 #include "qapi/visitor.h"
 #include "qapi/qmp-input-visitor.h"
 #include "qapi/qmp-output-visitor.h"

diff --git a/target-alpha/cpu-qom.h b/target-alpha/cpu-qom.h
index 6b4ca6d1d19ae77283127dfbc6dbae7370dcc92e..f2414f7e4f25a711d58a4aed67d0980b4ac09035 100644 (file)
--- a/target-alpha/cpu-qom.h
+++ b/target-alpha/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_ALPHA_CPU_QOM_H
 #define QEMU_ALPHA_CPU_QOM_H
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 #include "cpu.h"
 
 #define TYPE_ALPHA_CPU "alpha-cpu"

diff --git a/target-arm/cpu-qom.h b/target-arm/cpu-qom.h
index beabf9a0a9c3936281d3d0b99ae0caea0413eb08..0f455c40ff470993353cb6e1235df2910c13a8e7 100644 (file)
--- a/target-arm/cpu-qom.h
+++ b/target-arm/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_ARM_CPU_QOM_H
 #define QEMU_ARM_CPU_QOM_H
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 
 #define TYPE_ARM_CPU "arm-cpu"
 

diff --git a/target-cris/cpu-qom.h b/target-cris/cpu-qom.h
index d0e5f04f78ba662de239ace0caaa4b45ba2495dc..41ab9b2fa5e19edd97e9b77162fc8ba667394987 100644 (file)
--- a/target-cris/cpu-qom.h
+++ b/target-cris/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_CRIS_CPU_QOM_H
 #define QEMU_CRIS_CPU_QOM_H
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 
 #define TYPE_CRIS_CPU "cris-cpu"
 

diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h
index 3a7bc6aef4e06555083d9af0d733ac4ef76cac0c..332916a1857e178ad72880200e0c4c4e8a7f262c 100644 (file)
--- a/target-i386/cpu-qom.h
+++ b/target-i386/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_I386_CPU_QOM_H
 #define QEMU_I386_CPU_QOM_H
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 #include "cpu.h"
 #include "qapi/error.h"
 

diff --git a/target-lm32/cpu-qom.h b/target-lm32/cpu-qom.h
index 4ae2eddafbcd873b1ab7284ada1d189f2f59e3b1..400cdbd554a8f78b2d397f206ac3a881a34beec8 100644 (file)
--- a/target-lm32/cpu-qom.h
+++ b/target-lm32/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_LM32_CPU_QOM_H
 #define QEMU_LM32_CPU_QOM_H
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 #include "cpu.h"
 
 #define TYPE_LM32_CPU "lm32-cpu"

diff --git a/target-m68k/cpu-qom.h b/target-m68k/cpu-qom.h
index 805786b04d4cb7415d48d51ba089c170b21c5e87..170daa7c9623a14ed24cb150085fb03579e9007b 100644 (file)
--- a/target-m68k/cpu-qom.h
+++ b/target-m68k/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_M68K_CPU_QOM_H
 #define QEMU_M68K_CPU_QOM_H
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 
 #define TYPE_M68K_CPU "m68k-cpu"
 

diff --git a/target-microblaze/cpu-qom.h b/target-microblaze/cpu-qom.h
index 4b23303b6dd8a986f2c2bf4665e038cb815e60bf..f75549dc2265412ded9a0f461b798d53fac3f242 100644 (file)
--- a/target-microblaze/cpu-qom.h
+++ b/target-microblaze/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_MICROBLAZE_CPU_QOM_H
 #define QEMU_MICROBLAZE_CPU_QOM_H
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 
 #define TYPE_MICROBLAZE_CPU "microblaze-cpu"
 

diff --git a/target-mips/cpu-qom.h b/target-mips/cpu-qom.h
index 6e2237123aa1160fae0ba569c83c15c411f202f1..2a4b812402331d725e3016d2e12f554386398c1a 100644 (file)
--- a/target-mips/cpu-qom.h
+++ b/target-mips/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_MIPS_CPU_QOM_H
 #define QEMU_MIPS_CPU_QOM_H
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 
 #ifdef TARGET_MIPS64
 #define TYPE_MIPS_CPU "mips64-cpu"

diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h
index 8dc56c2873b08b23f3040ea9ea88e2fcf487ce75..876b386a3c34b3494d367e2c040598d2a18fe295 100644 (file)
--- a/target-openrisc/cpu.h
+++ b/target-openrisc/cpu.h
@@ -32,7 +32,7 @@ struct OpenRISCCPU;
 #include "qemu-common.h"
 #include "exec/cpu-defs.h"
 #include "softfloat.h"
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 #include "qapi/error.h"
 
 #define TYPE_OPENRISC_CPU "or32-cpu"

diff --git a/target-ppc/cpu-qom.h b/target-ppc/cpu-qom.h
index fef6f95a04d54476aa632b63dd6a4c047c14bb11..fb6b5a4119e800b06eae865255358edd59714b18 100644 (file)
--- a/target-ppc/cpu-qom.h
+++ b/target-ppc/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_PPC_CPU_QOM_H
 #define QEMU_PPC_CPU_QOM_H
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 #include "cpu.h"
 
 #ifdef TARGET_PPC64

diff --git a/target-s390x/cpu-qom.h b/target-s390x/cpu-qom.h
index 6fa55a80a590a181d0fa19bfd1d8dcbd31635df0..d54e4a2ee2ae8c86ff4211e43e6e90537cffe8a4 100644 (file)
--- a/target-s390x/cpu-qom.h
+++ b/target-s390x/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_S390_CPU_QOM_H
 #define QEMU_S390_CPU_QOM_H
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 #include "cpu.h"
 
 #define TYPE_S390_CPU "s390-cpu"

diff --git a/target-sh4/cpu-qom.h b/target-sh4/cpu-qom.h
index c41164aa221abe7754b80b0cf1e010714a0e47fa..09573c9c34f6e5a848c058914477bd48f8c1bbca 100644 (file)
--- a/target-sh4/cpu-qom.h
+++ b/target-sh4/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_SUPERH_CPU_QOM_H
 #define QEMU_SUPERH_CPU_QOM_H
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 
 #define TYPE_SUPERH_CPU "superh-cpu"
 

diff --git a/target-sparc/cpu-qom.h b/target-sparc/cpu-qom.h
index 3d3ac0fcefbe00d77f40c8853b0b76ed281ad97c..2a738ae360e3c4173dcc8456687fa6f4f5831d71 100644 (file)
--- a/target-sparc/cpu-qom.h
+++ b/target-sparc/cpu-qom.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_SPARC_CPU_QOM_H
 #define QEMU_SPARC_CPU_QOM_H
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 #include "cpu.h"
 
 #ifdef TARGET_SPARC64

diff --git a/target-unicore32/cpu-qom.h b/target-unicore32/cpu-qom.h
index 342d85e39b641f6c5f75c0916b2bed4f7eb397e5..fe40b2d6a8a48e01b1eafbb0d9d9de66dd7c99c6 100644 (file)
--- a/target-unicore32/cpu-qom.h
+++ b/target-unicore32/cpu-qom.h
@@ -11,7 +11,7 @@
 #ifndef QEMU_UC32_CPU_QOM_H
 #define QEMU_UC32_CPU_QOM_H
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 #include "cpu.h"
 
 #define TYPE_UNICORE32_CPU "unicore32-cpu"

diff --git a/target-xtensa/cpu-qom.h b/target-xtensa/cpu-qom.h
index 1fd2f274a1de92a7629af3848b89e7c4db8e4a91..e344a9aa79bdc8928c432443cb0bf0ef814d8d1b 100644 (file)
--- a/target-xtensa/cpu-qom.h
+++ b/target-xtensa/cpu-qom.h
@@ -29,7 +29,7 @@
 #ifndef QEMU_XTENSA_CPU_QOM_H
 #define QEMU_XTENSA_CPU_QOM_H
 
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
 #include "cpu.h"
 
 #define TYPE_XTENSA_CPU "xtensa-cpu"