From 4167c42c5eb79add9252547efe92df7e5c2d1abd Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 6 Dec 2012 11:51:59 +0100 Subject: qapi: remove qapi/qapi-types-core.h The file is only including error.h and qerror.h. Prefer explicit inclusion of whatever files are needed. Signed-off-by: Paolo Bonzini --- qom/object.c | 1 + 1 file changed, 1 insertion(+) (limited to 'qom') diff --git a/qom/object.c b/qom/object.c index 0739aa2943..8d3036dcf4 100644 --- a/qom/object.c +++ b/qom/object.c @@ -15,6 +15,7 @@ #include "qapi/qapi-visit-core.h" #include "qapi/string-input-visitor.h" #include "qapi/string-output-visitor.h" +#include "qerror.h" /* TODO: replace QObject with a simpler visitor to avoid a dependency * of the QOM core on QObject? */ -- cgit v1.2.3 From 7b1b5d191385ca52e96caae2a05c64f3a63855d9 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 17 Dec 2012 18:19:43 +0100 Subject: qapi: move include files to include/qobject/ Signed-off-by: Paolo Bonzini --- qom/object.c | 12 ++++++------ qom/qom-qobject.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'qom') diff --git a/qom/object.c b/qom/object.c index 8d3036dcf4..932f8b30de 100644 --- a/qom/object.c +++ b/qom/object.c @@ -12,18 +12,18 @@ #include "qemu/object.h" #include "qemu-common.h" -#include "qapi/qapi-visit-core.h" +#include "qapi/visitor.h" #include "qapi/string-input-visitor.h" #include "qapi/string-output-visitor.h" -#include "qerror.h" +#include "qapi/qmp/qerror.h" /* TODO: replace QObject with a simpler visitor to avoid a dependency * of the QOM core on QObject? */ #include "qemu/qom-qobject.h" -#include "qobject.h" -#include "qbool.h" -#include "qint.h" -#include "qstring.h" +#include "qapi/qmp/qobject.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qint.h" +#include "qapi/qmp/qstring.h" #define MAX_INTERFACES 32 diff --git a/qom/qom-qobject.c b/qom/qom-qobject.c index 0689914e15..f0fa652157 100644 --- a/qom/qom-qobject.c +++ b/qom/qom-qobject.c @@ -12,7 +12,7 @@ #include "qemu-common.h" #include "qemu/object.h" #include "qemu/qom-qobject.h" -#include "qapi/qapi-visit-core.h" +#include "qapi/visitor.h" #include "qapi/qmp-input-visitor.h" #include "qapi/qmp-output-visitor.h" -- cgit v1.2.3 From 14cccb618508a0aa70eb9ccf366703a019a45ff0 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 17 Dec 2012 18:19:50 +0100 Subject: qom: move include files to include/qom/ Signed-off-by: Paolo Bonzini --- qom/container.c | 2 +- qom/cpu.c | 2 +- qom/object.c | 4 ++-- qom/qom-qobject.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'qom') diff --git a/qom/container.c b/qom/container.c index 4ca8b5cba3..ceb0f0186d 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 diff --git a/qom/cpu.c b/qom/cpu.c index 5b360469c5..d4d436f80a 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -18,7 +18,7 @@ * */ -#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 932f8b30de..351b88c817 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 f0fa652157..6384b8e98c 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" -- cgit v1.2.3 From 1de7afc984b49af164e2619e6850b9732b173b34 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 17 Dec 2012 18:20:00 +0100 Subject: misc: move include files to include/qemu/ Signed-off-by: Paolo Bonzini --- qom/container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qom') diff --git a/qom/container.c b/qom/container.c index ceb0f0186d..5270a5ee9c 100644 --- a/qom/container.c +++ b/qom/container.c @@ -11,7 +11,7 @@ */ #include "qom/object.h" -#include "module.h" +#include "qemu/module.h" #include static TypeInfo container_info = { -- cgit v1.2.3