From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, afaerber@suse.de
Subject: [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/
Date: Thu, 6 Dec 2012 14:07:04 +0100 [thread overview]
Message-ID: <1354799230-30904-27-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1354799230-30904-1-git-send-email-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/qdev-core.h | 2 +-
hw/stream.h | 2 +-
include/qemu/rng-random.h | 2 +-
include/qemu/rng.h | 2 +-
include/{qemu => qom}/cpu.h | 2 +-
include/{qemu => qom}/object.h | 0
include/{qemu => qom}/qom-qobject.h | 2 +-
qmp.c | 2 +-
qom/container.c | 2 +-
qom/cpu.c | 2 +-
qom/object.c | 4 ++--
qom/qom-qobject.c | 4 ++--
target-alpha/cpu-qom.h | 2 +-
target-arm/cpu-qom.h | 2 +-
target-cris/cpu-qom.h | 2 +-
target-i386/cpu-qom.h | 2 +-
target-lm32/cpu-qom.h | 2 +-
target-m68k/cpu-qom.h | 2 +-
target-microblaze/cpu-qom.h | 2 +-
target-mips/cpu-qom.h | 2 +-
target-openrisc/cpu.h | 2 +-
target-ppc/cpu-qom.h | 2 +-
target-s390x/cpu-qom.h | 2 +-
target-sh4/cpu-qom.h | 2 +-
target-sparc/cpu-qom.h | 2 +-
target-unicore32/cpu-qom.h | 2 +-
target-xtensa/cpu-qom.h | 2 +-
27 files changed, 28 insertions(+), 28 deletions(-)
rename include/{qemu => qom}/cpu.h (99%)
rename include/{qemu => qom}/object.h (100%)
rename include/{qemu => qom}/qom-qobject.h (97%)
diff --git a/hw/qdev-core.h b/hw/qdev-core.h
index 506977c..93a3a2a 100644
--- 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 21123a9..f6137d6 100644
--- 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 6249290..4332772 100644
--- 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 3791297..509abd0 100644
--- 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 61b7698..9682dd5 100644
--- 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 f9dff12..77cd717 100644
--- 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 e873f0a..5b3a5d7 100644
--- 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 4ca8b5c..ceb0f01 100644
--- 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 5b36046..d4d436f 100644
--- 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 932f8b3..351b88c 100644
--- 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 f0fa652..6384b8e 100644
--- 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 6b4ca6d..f2414f7 100644
--- 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 beabf9a..0f455c4 100644
--- 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 d0e5f04..41ab9b2 100644
--- 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 3a7bc6a..332916a 100644
--- 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 4ae2edd..400cdbd 100644
--- 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 805786b..170daa7 100644
--- 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 4b23303..f75549d 100644
--- 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 6e22371..2a4b812 100644
--- 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 8dc56c2..876b386 100644
--- 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 fef6f95..fb6b5a4 100644
--- 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 6fa55a8..d54e4a2 100644
--- 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 c41164a..09573c9 100644
--- 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 3d3ac0f..2a738ae 100644
--- 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 342d85e..fe40b2d 100644
--- 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 1fd2f27..e344a9a 100644
--- 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"
--
1.7.1
next prev parent reply other threads:[~2012-12-06 13:09 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-06 13:06 [Qemu-devel] [PATCH 00/32] Build cleanups and header file movement to include/ Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 01/32] libcacard: simplify rules for recursive build Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 02/32] vscclient: use per-target variables Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 05/32] build: move rules from Makefile to */Makefile.objs Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 06/32] build: create ldscripts/ Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 07/32] build: kill libdis, move disassemblers to disas/ Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 08/32] build: kill libuser Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 09/32] janitor: do not rely on indirect inclusions of or from qemu-char.h Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 10/32] janitor: do not include qemu-char everywhere Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 11/32] net: move Bluetooth stuff out of net.h Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 12/32] net: do not include net.h everywhere Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 13/32] net: move net.c to net/ Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 14/32] net: reorganize headers Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 15/32] qemu-ga: move qemu-ga files to qga/ Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 16/32] ui: move files to ui/ and include/ui/ Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 17/32] qapi: move inclusions of qemu-common.h from headers to .c files Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 18/32] qapi: remove qapi/qapi-types-core.h Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 19/32] qapi: make struct Visitor opaque Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 20/32] janitor: add guards to headers Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 21/32] qapi: move include files to include/qapi/ Paolo Bonzini
2012-12-06 13:07 ` [Qemu-devel] [PATCH 22/32] block: move include files to include/block/ Paolo Bonzini
2012-12-06 13:07 ` [Qemu-devel] [PATCH 23/32] exec: move include files to include/exec/ Paolo Bonzini
2012-12-06 13:07 ` [Qemu-devel] [PATCH 24/32] monitor: move include files to include/monitor/ Paolo Bonzini
2012-12-06 13:07 ` [Qemu-devel] [PATCH 25/32] migration: move include files to include/migration/ Paolo Bonzini
2012-12-06 13:07 ` Paolo Bonzini [this message]
2012-12-06 13:07 ` [Qemu-devel] [PATCH 27/32] misc: move include files to include/qemu/ Paolo Bonzini
2012-12-06 13:07 ` [Qemu-devel] [PATCH 28/32] softmmu: move include files to include/sysemu/ Paolo Bonzini
2013-01-07 1:15 ` Amos Kong
2012-12-06 13:07 ` [Qemu-devel] [PATCH 29/32] softmmu: move remaining include files to include/ subdirectories Paolo Bonzini
2012-12-06 13:07 ` [Qemu-devel] [PATCH 30/32] fpu: move public header file to include/fpu Paolo Bonzini
2012-12-06 13:07 ` [Qemu-devel] [PATCH 31/32] hw: move executable format header files to hw/ Paolo Bonzini
2012-12-06 13:07 ` [Qemu-devel] [PATCH 32/32] janitor: move remaining public headers to include/ Paolo Bonzini
2012-12-11 8:45 ` [Qemu-devel] [PATCH 00/32] Build cleanups and header file movement " Stefan Hajnoczi
-- strict thread matches above, loose matches on Subject: below --
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/ Paolo Bonzini
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/ Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1354799230-30904-27-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=afaerber@suse.de \
--cc=aliguori@us.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).