summaryrefslogtreecommitdiffstats
path: root/qom
diff options
context:
space:
mode:
authorPaolo Bonzini2012-12-17 18:19:43 +0100
committerPaolo Bonzini2012-12-19 08:31:31 +0100
commit7b1b5d191385ca52e96caae2a05c64f3a63855d9 (patch)
tree53b7194e77868d920eddcd41504741fe5bfda337 /qom
parentjanitor: add guards to headers (diff)
downloadqemu-7b1b5d191385ca52e96caae2a05c64f3a63855d9.tar.gz
qemu-7b1b5d191385ca52e96caae2a05c64f3a63855d9.tar.xz
qemu-7b1b5d191385ca52e96caae2a05c64f3a63855d9.zip
qapi: move include files to include/qobject/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qom')
-rw-r--r--qom/object.c12
-rw-r--r--qom/qom-qobject.c2
2 files changed, 7 insertions, 7 deletions
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"