qapi: move include files to include/qobject/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
14 years ago · 7b1b5d1913
119 changed files with 242 additions and 242 deletions
--- a/backends/rng-egd.c
+++ b/backends/rng-egd.c
@ -12,7 +12,7 @@

 #include "qemu/rng.h"
 #include "qemu-char.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "hw/qdev.h" /* just for DEFINE_PROP_CHR */

 #define TYPE_RNG_EGD "rng-egd"
--- a/backends/rng-random.c
+++ b/backends/rng-random.c
@ -12,7 +12,7 @@

 #include "qemu/rng-random.h"
 #include "qemu/rng.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "main-loop.h"

 struct RndRandom
--- a/backends/rng.c
+++ b/backends/rng.c
@ -11,7 +11,7 @@
 */

 #include "qemu/rng.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"

 void rng_backend_request_entropy(RngBackend *s, size_t size,
                                 EntropyReceiveFunc *receive_entropy,
--- a/balloon.c
+++ b/balloon.c
@ -30,7 +30,7 @@
 #include "balloon.h"
 #include "trace.h"
 #include "qmp-commands.h"
-#include "qjson.h"
+#include "qapi/qmp/qjson.h"

 static QEMUBalloonEvent *balloon_event_fn;
 static QEMUBalloonStatus *balloon_stat_fn;
--- a/block.c
+++ b/block.c
@ -28,7 +28,7 @@
 #include "block_int.h"
 #include "blockjob.h"
 #include "module.h"
-#include "qjson.h"
+#include "qapi/qmp/qjson.h"
 #include "sysemu.h"
 #include "notify.h"
 #include "qemu-coroutine.h"
--- a/block.h
+++ b/block.h
@ -5,7 +5,7 @@
 #include "qemu-common.h"
 #include "qemu-option.h"
 #include "qemu-coroutine.h"
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"
 #include "qapi-types.h"

 /* block.c */
--- a/block/qcow2.c
+++ b/block/qcow2.c
@ -28,7 +28,7 @@
 #include "aes.h"
 #include "block/qcow2.h"
 #include "qemu-error.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "trace.h"

 /*
--- a/block/qed.c
+++ b/block/qed.c
@ -15,7 +15,7 @@
 #include "qemu-timer.h"
 #include "trace.h"
 #include "qed.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "migration.h"

 static void qed_aio_cancel(BlockDriverAIOCB *blockacb)
--- a/block_int.h
+++ b/block_int.h
@ -30,7 +30,7 @@
 #include "qemu-coroutine.h"
 #include "qemu-timer.h"
 #include "qapi-types.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "monitor.h"

 #define BLOCK_FLAG_ENCRYPT          1
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@ -12,7 +12,7 @@
 #include "blockdev.h"
 #include "hw/block-common.h"
 #include "monitor.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "sysemu.h"
 #include "qmp-commands.h"
 #include "trace.h"
--- a/blockdev.c
+++ b/blockdev.c
@ -11,10 +11,10 @@
 #include "hw/block-common.h"
 #include "blockjob.h"
 #include "monitor.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "qemu-option.h"
 #include "qemu-config.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
 #include "sysemu.h"
 #include "block_int.h"
 #include "qmp-commands.h"
--- a/blockdev.h
+++ b/blockdev.h
@ -11,7 +11,7 @@
 #define BLOCKDEV_H

 #include "block.h"
-#include "error.h"
+#include "qapi/error.h"
 #include "qemu-queue.h"

 void blockdev_mark_auto_del(BlockDriverState *bs);
--- a/blockjob.c
+++ b/blockjob.c
@ -30,7 +30,7 @@
 #include "block.h"
 #include "blockjob.h"
 #include "block_int.h"
-#include "qjson.h"
+#include "qapi/qmp/qjson.h"
 #include "qemu-coroutine.h"
 #include "qmp-commands.h"
 #include "qemu-timer.h"
--- a/dump-stub.c
+++ b/dump-stub.c
@ -13,7 +13,7 @@

 #include "qemu-common.h"
 #include "dump.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "qmp-commands.h"

 /* we need this function in hmp.c */
--- a/dump.c
+++ b/dump.c
@ -21,7 +21,7 @@
 #include "dump.h"
 #include "sysemu.h"
 #include "memory_mapping.h"
-#include "error.h"
+#include "qapi/error.h"
 #include "qmp-commands.h"
 #include "gdbstub.h"

--- a/error.c
+++ b/error.c
@ -11,11 +11,11 @@
 */

 #include "qemu-common.h"
-#include "error.h"
-#include "qjson.h"
-#include "qdict.h"
+#include "qapi/error.h"
+#include "qapi/qmp/qjson.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi-types.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"

 struct Error
 {
--- a/hmp.h
+++ b/hmp.h
@ -16,7 +16,7 @@

 #include "qemu-common.h"
 #include "qapi-types.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"

 void hmp_info_name(Monitor *mon);
 void hmp_info_version(Monitor *mon);
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@ -22,7 +22,7 @@
 #include "pci/msix.h"
 #include "kvm.h"
 #include "migration.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "event_notifier.h"
 #include "qemu-char.h"

--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@ -25,7 +25,7 @@
 #include "qemu-timer.h"
 #include "sysemu.h"
 #include "mc146818rtc.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.h"

 #ifdef TARGET_I386
 #include "apic.h"
--- a/hw/pci/pci-hotplug.c
+++ b/hw/pci/pci-hotplug.c
@ -32,7 +32,7 @@
 #include "hw/virtio-blk.h"
 #include "qemu-config.h"
 #include "blockdev.h"
-#include "error.h"
+#include "qapi/error.h"

 #if defined(TARGET_I386)
 static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon,
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@ -19,7 +19,7 @@
 */

 #include "sysemu.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
 #include "monitor.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pcie.h"
--- a/hw/qdev-addr.c
+++ b/hw/qdev-addr.c
@ -1,7 +1,7 @@
 #include "qdev.h"
 #include "qdev-addr.h"
 #include "hwaddr.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.h"

 /* --- target physical address --- */

--- a/hw/qdev-core.h
+++ b/hw/qdev-core.h
@ -6,7 +6,7 @@
 #include "qemu-types.h"
 #include "qemu/object.h"
 #include "hw/irq.h"
-#include "error.h"
+#include "qapi/error.h"

 enum DevState {
    DEV_STATE_CREATED = 1,
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@ -1,10 +1,10 @@
 #include "net/net.h"
 #include "qdev.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "blockdev.h"
 #include "hw/block-common.h"
 #include "net/hub.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.h"
 #include "qemu-char.h"

 void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
--- a/hw/qdev.c
+++ b/hw/qdev.c
@ -28,8 +28,8 @@
 #include "net/net.h"
 #include "qdev.h"
 #include "sysemu.h"
-#include "error.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/error.h"
+#include "qapi/visitor.h"

 int qdev_hotplug = 0;
 static bool qdev_hot_added = false;
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@ -25,7 +25,7 @@
 #define HW_VGA_INT_H 1

 #include <hw/hw.h>
-#include "error.h"
+#include "qapi/error.h"
 #include "memory.h"

 #define ST01_V_RETRACE      0x08
--- a/hw/watchdog.c
+++ b/hw/watchdog.c
@ -23,7 +23,7 @@
 #include "qemu-option.h"
 #include "qemu-config.h"
 #include "qemu-queue.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
 #include "monitor.h"
 #include "sysemu.h"
 #include "hw/watchdog.h"
--- a/include/net/net.h
+++ b/include/net/net.h
@ -3,7 +3,7 @@

 #include "qemu-queue.h"
 #include "qemu-common.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
 #include "qemu-option.h"
 #include "net/queue.h"
 #include "vmstate.h"
--- a/include/net/slirp.h
+++ b/include/net/slirp.h
@ -25,7 +25,7 @@
 #define QEMU_NET_SLIRP_H

 #include "qemu-common.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
 #include "qemu-option.h"
 #include "qapi-types.h"

--- a/include/qapi/dealloc-visitor.h
+++ b/include/qapi/dealloc-visitor.h
@ -14,7 +14,7 @@
 #ifndef QAPI_DEALLOC_VISITOR_H
 #define QAPI_DEALLOC_VISITOR_H

-#include "qapi-visit-core.h"
+#include "qapi/visitor.h"

 typedef struct QapiDeallocVisitor QapiDeallocVisitor;

--- a/include/qapi/error.h
+++ b/include/qapi/error.h
--- a/include/qapi/opts-visitor.h
+++ b/include/qapi/opts-visitor.h
@ -13,7 +13,7 @@
 #ifndef OPTS_VISITOR_H
 #define OPTS_VISITOR_H

-#include "qapi-visit-core.h"
+#include "qapi/visitor.h"
 #include "qemu-option.h"

 typedef struct OptsVisitor OptsVisitor;
--- a/include/qapi/qmp-input-visitor.h
+++ b/include/qapi/qmp-input-visitor.h
@ -14,8 +14,8 @@
 #ifndef QMP_INPUT_VISITOR_H
 #define QMP_INPUT_VISITOR_H

-#include "qapi-visit-core.h"
-#include "qobject.h"
+#include "qapi/visitor.h"
+#include "qapi/qmp/qobject.h"

 typedef struct QmpInputVisitor QmpInputVisitor;

--- a/include/qapi/qmp-output-visitor.h
+++ b/include/qapi/qmp-output-visitor.h
@ -14,8 +14,8 @@
 #ifndef QMP_OUTPUT_VISITOR_H
 #define QMP_OUTPUT_VISITOR_H

-#include "qapi-visit-core.h"
-#include "qobject.h"
+#include "qapi/visitor.h"
+#include "qapi/qmp/qobject.h"

 typedef struct QmpOutputVisitor QmpOutputVisitor;

--- a/include/qapi/qmp/dispatch.h
+++ b/include/qapi/qmp/dispatch.h
@ -14,9 +14,9 @@
 #ifndef QMP_CORE_H
 #define QMP_CORE_H

-#include "qobject.h"
-#include "qdict.h"
-#include "error.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/error.h"

 typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);

--- a/include/qapi/qmp/json-lexer.h
+++ b/include/qapi/qmp/json-lexer.h
@ -14,8 +14,8 @@
 #ifndef QEMU_JSON_LEXER_H
 #define QEMU_JSON_LEXER_H

-#include "qstring.h"
-#include "qlist.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qlist.h"

 typedef enum json_token_type {
    JSON_OPERATOR = 100,
--- a/include/qapi/qmp/json-parser.h
+++ b/include/qapi/qmp/json-parser.h
@ -15,8 +15,8 @@
 #define QEMU_JSON_PARSER_H

 #include "qemu-common.h"
-#include "qlist.h"
-#include "error.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/error.h"

 QObject *json_parser_parse(QList *tokens, va_list *ap);
 QObject *json_parser_parse_err(QList *tokens, va_list *ap, Error **errp);
--- a/include/qapi/qmp/json-streamer.h
+++ b/include/qapi/qmp/json-streamer.h
@ -14,8 +14,8 @@
 #ifndef QEMU_JSON_STREAMER_H
 #define QEMU_JSON_STREAMER_H

-#include "qlist.h"
-#include "json-lexer.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/json-lexer.h"

 typedef struct JSONMessageParser
 {
--- a/include/qapi/qmp/qbool.h
+++ b/include/qapi/qmp/qbool.h
@ -15,7 +15,7 @@
 #define QBOOL_H

 #include <stdint.h>
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"

 typedef struct QBool {
    QObject_HEAD;
--- a/include/qapi/qmp/qdict.h
+++ b/include/qapi/qmp/qdict.h
@ -13,8 +13,8 @@
 #ifndef QDICT_H
 #define QDICT_H

-#include "qobject.h"
-#include "qlist.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp/qlist.h"
 #include "qemu-queue.h"
 #include <stdint.h>

--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@ -12,10 +12,10 @@
 #ifndef QERROR_H
 #define QERROR_H

-#include "qdict.h"
-#include "qstring.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qstring.h"
 #include "qemu-error.h"
-#include "error.h"
+#include "qapi/error.h"
 #include "qapi-types.h"
 #include <stdarg.h>

--- a/include/qapi/qmp/qfloat.h
+++ b/include/qapi/qmp/qfloat.h
@ -15,7 +15,7 @@
 #define QFLOAT_H

 #include <stdint.h>
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"

 typedef struct QFloat {
    QObject_HEAD;
--- a/include/qapi/qmp/qint.h
+++ b/include/qapi/qmp/qint.h
@ -14,7 +14,7 @@
 #define QINT_H

 #include <stdint.h>
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"

 typedef struct QInt {
    QObject_HEAD;
--- a/include/qapi/qmp/qjson.h
+++ b/include/qapi/qmp/qjson.h
@ -16,8 +16,8 @@

 #include <stdarg.h>
 #include "compiler.h"
-#include "qobject.h"
-#include "qstring.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp/qstring.h"

 QObject *qobject_from_json(const char *string) GCC_FMT_ATTR(1, 0);
 QObject *qobject_from_jsonf(const char *string, ...) GCC_FMT_ATTR(1, 2);
--- a/include/qapi/qmp/qlist.h
+++ b/include/qapi/qmp/qlist.h
@ -13,7 +13,7 @@
 #ifndef QLIST_H
 #define QLIST_H

-#include "qobject.h"
+#include "qapi/qmp/qobject.h"
 #include "qemu-queue.h"
 #include "qemu-queue.h"

--- a/include/qapi/qmp/qobject.h
+++ b/include/qapi/qmp/qobject.h
--- a/include/qapi/qmp/qstring.h
+++ b/include/qapi/qmp/qstring.h
@ -14,7 +14,7 @@
 #define QSTRING_H

 #include <stdint.h>
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"

 typedef struct QString {
    QObject_HEAD;
--- a/include/qapi/qmp/types.h
+++ b/include/qapi/qmp/types.h
@ -13,13 +13,13 @@
 #ifndef QEMU_OBJECTS_H
 #define QEMU_OBJECTS_H

-#include "qobject.h"
-#include "qint.h"
-#include "qfloat.h"
-#include "qbool.h"
-#include "qstring.h"
-#include "qdict.h"
-#include "qlist.h"
-#include "qjson.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qfloat.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qjson.h"

 #endif /* QEMU_OBJECTS_H */
--- a/include/qapi/string-input-visitor.h
+++ b/include/qapi/string-input-visitor.h
@ -13,7 +13,7 @@
 #ifndef STRING_INPUT_VISITOR_H
 #define STRING_INPUT_VISITOR_H

-#include "qapi-visit-core.h"
+#include "qapi/visitor.h"

 typedef struct StringInputVisitor StringInputVisitor;

--- a/include/qapi/string-output-visitor.h
+++ b/include/qapi/string-output-visitor.h
@ -13,7 +13,7 @@
 #ifndef STRING_OUTPUT_VISITOR_H
 #define STRING_OUTPUT_VISITOR_H

-#include "qapi-visit-core.h"
+#include "qapi/visitor.h"

 typedef struct StringOutputVisitor StringOutputVisitor;

--- a/include/qapi/visitor-impl.h
+++ b/include/qapi/visitor-impl.h
@ -12,8 +12,8 @@
 #ifndef QAPI_VISITOR_IMPL_H
 #define QAPI_VISITOR_IMPL_H

-#include "error.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/error.h"
+#include "qapi/visitor.h"

 struct Visitor
 {
--- a/include/qapi/visitor.h
+++ b/include/qapi/visitor.h
@ -13,7 +13,7 @@
 #ifndef QAPI_VISITOR_CORE_H
 #define QAPI_VISITOR_CORE_H

-#include "error.h"
+#include "qapi/error.h"
 #include <stdlib.h>

 typedef struct GenericList
--- a/include/qemu/rng.h
+++ b/include/qemu/rng.h
@ -15,7 +15,7 @@

 #include "qemu/object.h"
 #include "qemu-common.h"
-#include "error.h"
+#include "qapi/error.h"

 #define TYPE_RNG_BACKEND "rng-backend"
 #define RNG_BACKEND(obj) \
--- a/include/ui/console.h
+++ b/include/ui/console.h
@ -2,12 +2,12 @@
 #define CONSOLE_H

 #include "ui/qemu-pixman.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
 #include "notify.h"
 #include "monitor.h"
 #include "trace.h"
 #include "qapi-types.h"
-#include "error.h"
+#include "qapi/error.h"

 /* keyboard/mouse support */

--- a/json-lexer.c
+++ b/json-lexer.c
@ -11,12 +11,12 @@
 *
 */

-#include "qstring.h"
-#include "qlist.h"
-#include "qdict.h"
-#include "qint.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qint.h"
 #include "qemu-common.h"
-#include "json-lexer.h"
+#include "qapi/qmp/json-lexer.h"

 #define MAX_TOKEN_SIZE (64ULL << 20)

--- a/json-parser.c
+++ b/json-parser.c
@ -14,15 +14,15 @@
 #include <stdarg.h>

 #include "qemu-common.h"
-#include "qstring.h"
-#include "qint.h"
-#include "qdict.h"
-#include "qlist.h"
-#include "qfloat.h"
-#include "qbool.h"
-#include "json-parser.h"
-#include "json-lexer.h"
-#include "qerror.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qfloat.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/json-parser.h"
+#include "qapi/qmp/json-lexer.h"
+#include "qapi/qmp/qerror.h"

 typedef struct JSONParserContext
 {
--- a/json-streamer.c
+++ b/json-streamer.c
@ -11,12 +11,12 @@
 *
 */

-#include "qlist.h"
-#include "qint.h"
-#include "qdict.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qdict.h"
 #include "qemu-common.h"
-#include "json-lexer.h"
-#include "json-streamer.h"
+#include "qapi/qmp/json-lexer.h"
+#include "qapi/qmp/json-streamer.h"

 #define MAX_TOKEN_SIZE (64ULL << 20)
 #define MAX_NESTING (1ULL << 10)
--- a/migration.h
+++ b/migration.h
@ -14,10 +14,10 @@
 #ifndef QEMU_MIGRATION_H
 #define QEMU_MIGRATION_H

-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
 #include "qemu-common.h"
 #include "notify.h"
-#include "error.h"
+#include "qapi/error.h"
 #include "vmstate.h"
 #include "qapi-types.h"

--- a/monitor.c
+++ b/monitor.c
@ -47,14 +47,14 @@
 #include "migration.h"
 #include "kvm.h"
 #include "acl.h"
-#include "qint.h"
-#include "qfloat.h"
-#include "qlist.h"
-#include "qbool.h"
-#include "qstring.h"
-#include "qjson.h"
-#include "json-streamer.h"
-#include "json-parser.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qfloat.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qjson.h"
+#include "qapi/qmp/json-streamer.h"
+#include "qapi/qmp/json-parser.h"
 #include "osdep.h"
 #include "cpu.h"
 #include "trace.h"
--- a/monitor.h
+++ b/monitor.h
@ -2,8 +2,8 @@
 #define MONITOR_H

 #include "qemu-common.h"
-#include "qerror.h"
-#include "qdict.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/qmp/qdict.h"
 #include "block.h"
 #include "readline.h"

--- a/net/net.c
+++ b/net/net.c
@ -38,7 +38,7 @@
 #include "iov.h"
 #include "qapi-visit.h"
 #include "qapi/opts-visitor.h"
-#include "qapi/qapi-dealloc-visitor.h"
+#include "qapi/dealloc-visitor.h"

 /* Net bridge is currently not supported for W32. */
 #if !defined(_WIN32)
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit a5e5179b5624c99c812e9bf6e7b907e355a811e8
+Subproject commit 97336fad32acf802003855cd8bd6477fa49a12e3
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@ -11,11 +11,11 @@
 */

 #include "qemu-common.h"
-#include "qerror.h"
-#include "opts-visitor.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/opts-visitor.h"
 #include "qemu-queue.h"
 #include "qemu-option-internal.h"
-#include "qapi-visit-impl.h"
+#include "qapi/visitor-impl.h"


 struct OptsVisitor
--- a/qapi/qapi-dealloc-visitor.c
+++ b/qapi/qapi-dealloc-visitor.c
@ -11,11 +11,11 @@
 *
 */

-#include "qapi-dealloc-visitor.h"
+#include "qapi/dealloc-visitor.h"
 #include "qemu-queue.h"
 #include "qemu-common.h"
-#include "qemu-objects.h"
-#include "qapi-visit-impl.h"
+#include "qapi/qmp/types.h"
+#include "qapi/visitor-impl.h"

 typedef struct StackEntry
 {
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@ -12,9 +12,9 @@
 */

 #include "qemu-common.h"
-#include "qerror.h"
-#include "qapi/qapi-visit-core.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/visitor.h"
+#include "qapi/visitor-impl.h"

 void visit_start_handle(Visitor *v, void **obj, const char *kind,
                        const char *name, Error **errp)
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@ -11,12 +11,12 @@
 *
 */

-#include "qemu-objects.h"
-#include "qapi/qmp-core.h"
-#include "json-parser.h"
+#include "qapi/qmp/types.h"
+#include "qapi/qmp/dispatch.h"
+#include "qapi/qmp/json-parser.h"
 #include "qapi-types.h"
-#include "error.h"
-#include "qerror.h"
+#include "qapi/error.h"
+#include "qapi/qmp/qerror.h"

 static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
 {
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@ -11,12 +11,12 @@
 *
 */

-#include "qmp-input-visitor.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/qmp-input-visitor.h"
+#include "qapi/visitor-impl.h"
 #include "qemu-queue.h"
 #include "qemu-common.h"
-#include "qemu-objects.h"
-#include "qerror.h"
+#include "qapi/qmp/types.h"
+#include "qapi/qmp/qerror.h"

 #define QIV_STACK_SIZE 1024

--- a/qapi/qmp-output-visitor.c
+++ b/qapi/qmp-output-visitor.c
@ -11,12 +11,12 @@
 *
 */

-#include "qmp-output-visitor.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/qmp-output-visitor.h"
+#include "qapi/visitor-impl.h"
 #include "qemu-queue.h"
 #include "qemu-common.h"
-#include "qemu-objects.h"
-#include "qerror.h"
+#include "qapi/qmp/types.h"
+#include "qapi/qmp/qerror.h"

 typedef struct QStackEntry
 {
--- a/qapi/qmp-registry.c
+++ b/qapi/qmp-registry.c
@ -14,7 +14,7 @@

 #include <glib.h>
 #include <string.h>
-#include "qapi/qmp-core.h"
+#include "qapi/qmp/dispatch.h"

 static QTAILQ_HEAD(QmpCommandList, QmpCommand) qmp_commands =
    QTAILQ_HEAD_INITIALIZER(qmp_commands);
--- a/qapi/string-input-visitor.c
+++ b/qapi/string-input-visitor.c
@ -11,9 +11,9 @@
 */

 #include "qemu-common.h"
-#include "string-input-visitor.h"
-#include "qapi/qapi-visit-impl.h"
-#include "qerror.h"
+#include "qapi/string-input-visitor.h"
+#include "qapi/visitor-impl.h"
+#include "qapi/qmp/qerror.h"

 struct StringInputVisitor
 {
--- a/qapi/string-output-visitor.c
+++ b/qapi/string-output-visitor.c
@ -11,9 +11,9 @@
 */

 #include "qemu-common.h"
-#include "string-output-visitor.h"
-#include "qapi/qapi-visit-impl.h"
-#include "qerror.h"
+#include "qapi/string-output-visitor.h"
+#include "qapi/visitor-impl.h"
+#include "qapi/qmp/qerror.h"

 struct StringOutputVisitor
 {
--- a/qbool.c
+++ b/qbool.c
@ -11,8 +11,8 @@
 *
 */

-#include "qbool.h"
-#include "qobject.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qobject.h"
 #include "qemu-common.h"

 static void qbool_destroy_obj(QObject *obj);
--- a/qdict.c
+++ b/qdict.c
@ -10,12 +10,12 @@
 * See the COPYING.LIB file in the top-level directory.
 */

-#include "qint.h"
-#include "qfloat.h"
-#include "qdict.h"
-#include "qbool.h"
-#include "qstring.h"
-#include "qobject.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qfloat.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qobject.h"
 #include "qemu-queue.h"
 #include "qemu-common.h"

--- a/qemu-char.h
+++ b/qemu-char.h
@ -6,8 +6,8 @@
 #include "qemu-option.h"
 #include "qemu-config.h"
 #include "qemu-aio.h"
-#include "qobject.h"
-#include "qstring.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp/qstring.h"
 #include "main-loop.h"

 /* character device */
--- a/qemu-config.c
+++ b/qemu-config.c
@ -3,7 +3,7 @@
 #include "qemu-option.h"
 #include "qemu-config.h"
 #include "hw/qdev.h"
-#include "error.h"
+#include "qapi/error.h"

 static QemuOptsList qemu_drive_opts = {
    .name = "drive",
--- a/qemu-config.h
+++ b/qemu-config.h
@ -3,7 +3,7 @@

 #include <stdio.h>
 #include "qemu-option.h"
-#include "error.h"
+#include "qapi/error.h"
 #include "qemu-option.h"

 extern QemuOptsList qemu_fsdev_opts;
--- a/qemu-img.c
+++ b/qemu-img.c
@ -23,7 +23,7 @@
 */
 #include "qapi-visit.h"
 #include "qapi/qmp-output-visitor.h"
-#include "qjson.h"
+#include "qapi/qmp/qjson.h"
 #include "qemu-common.h"
 #include "qemu-option.h"
 #include "qemu-error.h"
--- a/qemu-option.c
+++ b/qemu-option.c
@ -28,9 +28,9 @@

 #include "qemu-common.h"
 #include "qemu-error.h"
-#include "qemu-objects.h"
-#include "error.h"
-#include "qerror.h"
+#include "qapi/qmp/types.h"
+#include "qapi/error.h"
+#include "qapi/qmp/qerror.h"
 #include "qemu-option-internal.h"

 /*
--- a/qemu-option.h
+++ b/qemu-option.h
@ -28,8 +28,8 @@

 #include <stdint.h>
 #include "qemu-queue.h"
-#include "error.h"
-#include "qdict.h"
+#include "qapi/error.h"
+#include "qapi/qmp/qdict.h"

 enum QEMUOptionParType {
    OPT_FLAG,
--- a/qemu_socket.h
+++ b/qemu_socket.h
@ -27,8 +27,8 @@ int inet_aton(const char *cp, struct in_addr *ia);
 #endif /* !_WIN32 */

 #include "qemu-option.h"
-#include "error.h"
-#include "qerror.h"
+#include "qapi/error.h"
+#include "qapi/qmp/qerror.h"

 /* misc helpers */
 int qemu_socket(int domain, int type, int protocol);
--- a/qerror.c
+++ b/qerror.c
@ -11,8 +11,8 @@
 */

 #include "monitor.h"
-#include "qjson.h"
-#include "qerror.h"
+#include "qapi/qmp/qjson.h"
+#include "qapi/qmp/qerror.h"
 #include "qemu-common.h"

 static void qerror_destroy_obj(QObject *obj);
--- a/qfloat.c
+++ b/qfloat.c
@ -11,8 +11,8 @@
 *
 */

-#include "qfloat.h"
-#include "qobject.h"
+#include "qapi/qmp/qfloat.h"
+#include "qapi/qmp/qobject.h"
 #include "qemu-common.h"

 static void qfloat_destroy_obj(QObject *obj);
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@ -17,7 +17,7 @@
 #include <sys/wait.h>
 #include "qga/guest-agent-core.h"
 #include "qga-qmp-commands.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "qemu-queue.h"
 #include "host-utils.h"

--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@ -16,7 +16,7 @@
 #include <powrprof.h>
 #include "qga/guest-agent-core.h"
 #include "qga-qmp-commands.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"

 #ifndef SHTDN_REASON_FLAG_PLANNED
 #define SHTDN_REASON_FLAG_PLANNED 0x80000000
--- a/qga/commands.c
+++ b/qga/commands.c
@ -13,7 +13,7 @@
 #include <glib.h>
 #include "qga/guest-agent-core.h"
 #include "qga-qmp-commands.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"

 /* Note: in some situations, like with the fsfreeze, logging may be
 * temporarilly disabled. if it is necessary that a command be able
--- a/qga/guest-agent-core.h
+++ b/qga/guest-agent-core.h
@ -10,7 +10,7 @@
 * This work is licensed under the terms of the GNU GPL, version 2 or later.
 * See the COPYING file in the top-level directory.
 */
-#include "qapi/qmp-core.h"
+#include "qapi/qmp/dispatch.h"
 #include "qemu-common.h"

 #define QGA_READ_COUNT_DEFAULT 4096
--- a/qga/main.c
+++ b/qga/main.c
@ -20,15 +20,15 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 #endif
-#include "json-streamer.h"
-#include "json-parser.h"
-#include "qint.h"
-#include "qjson.h"
+#include "qapi/qmp/json-streamer.h"
+#include "qapi/qmp/json-parser.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qjson.h"
 #include "qga/guest-agent-core.h"
 #include "module.h"
 #include "signal.h"
-#include "qerror.h"
-#include "qapi/qmp-core.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/qmp/dispatch.h"
 #include "qga/channel.h"
 #ifdef _WIN32
 #include "qga/service-win32.h"
--- a/qint.c
+++ b/qint.c
@ -10,8 +10,8 @@
 * See the COPYING.LIB file in the top-level directory.
 */

-#include "qint.h"
-#include "qobject.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qobject.h"
 #include "qemu-common.h"

 static void qint_destroy_obj(QObject *obj);
--- a/qjson.c
+++ b/qjson.c
@ -11,15 +11,15 @@
 *
 */

-#include "json-lexer.h"
-#include "json-parser.h"
-#include "json-streamer.h"
-#include "qjson.h"
-#include "qint.h"
-#include "qlist.h"
-#include "qbool.h"
-#include "qfloat.h"
-#include "qdict.h"
+#include "qapi/qmp/json-lexer.h"
+#include "qapi/qmp/json-parser.h"
+#include "qapi/qmp/json-streamer.h"
+#include "qapi/qmp/qjson.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qfloat.h"
+#include "qapi/qmp/qdict.h"

 typedef struct JSONParsingState
 {
--- a/qlist.c
+++ b/qlist.c
@ -10,8 +10,8 @@
 * See the COPYING.LIB file in the top-level directory.
 */

-#include "qlist.h"
-#include "qobject.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qobject.h"
 #include "qemu-queue.h"
 #include "qemu-common.h"

--- 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

--- 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"

--- a/qstring.c
+++ b/qstring.c
@ -10,8 +10,8 @@
 * See the COPYING.LIB file in the top-level directory.
 */

-#include "qobject.h"
-#include "qstring.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp/qstring.h"
 #include "qemu-common.h"

 static void qstring_destroy_obj(QObject *obj);
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@ -342,8 +342,8 @@ def gen_command_decl_prologue(header, guard, prefix=""):
 #define %(guard)s

 #include "%(prefix)sqapi-types.h"
-#include "qdict.h"
-#include "error.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/error.h"

 ''',
                 header=basename(header), guard=guardname(header), prefix=prefix)
@ -368,13 +368,13 @@ def gen_command_def_prologue(prefix="", proxy=False):

 #include "qemu-common.h"
 #include "module.h"
-#include "qerror.h"
-#include "qemu-objects.h"
-#include "qapi/qmp-core.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/qmp/types.h"
+#include "qapi/qmp/dispatch.h"
+#include "qapi/visitor.h"
 #include "qapi/qmp-output-visitor.h"
 #include "qapi/qmp-input-visitor.h"
-#include "qapi/qapi-dealloc-visitor.h"
+#include "qapi/dealloc-visitor.h"
 #include "%(prefix)sqapi-types.h"
 #include "%(prefix)sqapi-visit.h"

--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@ -248,7 +248,7 @@ fdef.write(mcgen('''
 *
 */

-#include "qapi/qapi-dealloc-visitor.h"
+#include "qapi/dealloc-visitor.h"
 #include "%(prefix)sqapi-types.h"
 #include "%(prefix)sqapi-visit.h"

--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@ -322,7 +322,7 @@ fdecl.write(mcgen('''
 #ifndef %(guard)s
 #define %(guard)s

-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.h"
 #include "%(prefix)sqapi-types.h"
 ''',
                  prefix=prefix, guard=guardname(h_file)))
--- a/stubs/arch-query-cpu-def.c
+++ b/stubs/arch-query-cpu-def.c
@ -1,6 +1,6 @@
 #include "qemu-common.h"
 #include "arch_init.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"

 CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
 {
--- a/target-i386/cpu-qom.h
+++ b/target-i386/cpu-qom.h
@ -22,7 +22,7 @@

 #include "qemu/cpu.h"
 #include "cpu.h"
-#include "error.h"
+#include "qapi/error.h"

 #ifdef TARGET_X86_64
 #define TYPE_X86_CPU "x86_64-cpu"
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@ -26,9 +26,9 @@

 #include "qemu-option.h"
 #include "qemu-config.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"

-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.h"
 #include "arch_init.h"

 #include "hyperv.h"
--- a/target-openrisc/cpu.h
+++ b/target-openrisc/cpu.h
@ -33,7 +33,7 @@ struct OpenRISCCPU;
 #include "cpu-defs.h"
 #include "softfloat.h"
 #include "qemu/cpu.h"
-#include "error.h"
+#include "qapi/error.h"

 #define TYPE_OPENRISC_CPU "or32-cpu"