qapi: move include files to include/qobject/

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

diff --git a/backends/rng-egd.c b/backends/rng-egd.c
index ad8473777ca6d855578b01c8b1e465f5015c8e25..3a7d1ecbe02e8241398e5fb0b134f4918f10467d 100644 (file)
--- 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"

diff --git a/backends/rng-random.c b/backends/rng-random.c
index 9c9923b2acc1111238ec5d3881e6316db740d03e..c201953f29c3829ced1c4e56e76d836aafde2b6c 100644 (file)
--- 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

diff --git a/backends/rng.c b/backends/rng.c
index 06f261180c84f40f311e8806bb8c95fed2c1cf26..48a5840cd54110fac0a8db2f9b26ddbb2de94e84 100644 (file)
--- 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,

diff --git a/balloon.c b/balloon.c
index e02ab1c8849c8f5b8873999de44711d59a65a967..610fe6d6268f80dff695484547edc724db45bde5 100644 (file)
--- 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;

diff --git a/block.c b/block.c
index 0668c4be176bcc1855948802234eb4925da3eae5..e962a5afe9542fa525b1c7480b9448a3a7ba2a9c 100644 (file)
--- 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"

diff --git a/block.h b/block.h
index 893448a5fc07b226a046b2551dd7856e643af1d5..0b22892d61d6bb02dba2ec6fc9439adb7304887b 100644 (file)
--- 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 */

diff --git a/block/qcow2.c b/block/qcow2.c
index 8520bda21a4dcf4021501f5fb0055b0b86a976fc..217b4e422fe228379cacbbda9b70bc3fe5ddc91f 100644 (file)
--- 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"
 
 /*

diff --git a/block/qed.c b/block/qed.c
index 0b5374a2025a44476ccbafe53e1fbcfd6a9515b2..ca1fafb47e80f641aff6d43b5da4d91cfc145cf6 100644 (file)
--- 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)

diff --git a/block_int.h b/block_int.h
index bf3f79b3dbbe7ee8b710ad948bb12940bf37381e..a748b6c571586bf6896bc55637d32852d40b04b9 100644 (file)
--- 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

diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 6b26bbf8c500196b8ff12dafa9b9cd94f8616b2c..a194ecd392f43962248f61248f23cb9efb666f75 100644 (file)
--- 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"

diff --git a/blockdev.c b/blockdev.c
index 9a05e570093f56a0fee709712ea27517be0d407d..c85c6145776aaf4d8d1e67e32e1a8a5f26934edf 100644 (file)
--- 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"

diff --git a/blockdev.h b/blockdev.h
index d73d552a98a2dbf731ff6915884714689fd6729d..6e36d9f2c280f07674f6dd8c6f81937d1b4c24cb 100644 (file)
--- 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);

diff --git a/blockjob.c b/blockjob.c
index cda12c6933f3347e08892235c76a55b13ff6f269..8c0a286a77910f8ad34ec7b6c9b5cd627f975769 100644 (file)
--- 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"

diff --git a/dump-stub.c b/dump-stub.c
index 56d4564f0fc20f0ece70c60004d50a0c27d5373c..0842e6f916d52feaefcabf293bfc44d01113def6 100644 (file)
--- 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 */

diff --git a/dump.c b/dump.c
index 5640c2c2ff5f28508efdf5b5deb6f28122d75fc4..7b45b53a8fc9fc8f2103bd4e4ec1061e61a509aa 100644 (file)
--- 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"
 

diff --git a/error.c b/error.c
index 128d88cd9134e769bee0a41116452ae92cab83fe..519f6b6ce00d777c261d761228e9874c8f3ac088 100644 (file)
--- 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
 {

diff --git a/hmp.h b/hmp.h
index 0ab03be98262f78f4500f30ffc2c23cd70d10d93..21f3e05d09f5bebf04b12bb961f5bb3db8c559bc 100644 (file)
--- 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);

diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index 5c648d98d355fd468a0d65ab4fe77586e3c1956d..d15760b3147b22d0d7aa1439b94c0003ff7ebf12 100644 (file)
--- 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"
 

diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index c79fca7d6839c03ebe5258b272360d6a829dbfbc..2a1278f3931d029d299f06bf82fb26c538bd3b68 100644 (file)
--- 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"

diff --git a/hw/pci/pci-hotplug.c b/hw/pci/pci-hotplug.c
index b8504002526b89fd029a16abef755f573a4c54f5..5ba7558ecd59fe3a9cf1499c9842d51338730c5b 100644 (file)
--- 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,

diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index 8a2032ca49fc54aaa498c21f7c6194034594760a..b6f4f8510f561d05d83d9c9a09d0301a4e2fce24 100644 (file)
--- 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"

diff --git a/hw/qdev-addr.c b/hw/qdev-addr.c
index ea32c31ab6fc5e6ffe9604178d215afc8482d84e..552ee21f823c42011cd3ae37ac88968262386d47 100644 (file)
--- 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 --- */
 

diff --git a/hw/qdev-core.h b/hw/qdev-core.h
index d672ccafe619ef36ac43ee7d570f1583fa23ee79..506977c1098998fa490d534be96664911224b0b1 100644 (file)
--- 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,

diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 7ab55efe43e366e1b41539d9eecf36c96b440122..ba6c648fed20654fa3b827ba6309d3a2004fdc96 100644 (file)
--- 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)

diff --git a/hw/qdev.c b/hw/qdev.c
index 6b91fb987bd53e37f972151c26eea65d142eebc4..0a2a32d5d3ffb1564858a1611cebc98279ba3152 100644 (file)
--- 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;

diff --git a/hw/vga_int.h b/hw/vga_int.h
index ad02404b3c7f79759d91463aacfe2ce213a20cb3..5efaee81d99907df40a8ef22f96fe4746aa228d5 100644 (file)
--- 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

diff --git a/hw/watchdog.c b/hw/watchdog.c
index 5c82c17d098aa34e138ae0bed7961608fd6e1eb4..f878bec860db88a2e15e72bebd23299dd0c2dc56 100644 (file)
--- 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"

diff --git a/include/net/net.h b/include/net/net.h
index 9ff9305d7a7e3e083a9dac7597a2d084305c6d38..26dd0cf29cd3023c8a457bf7b71e0b088c8c9d31 100644 (file)
--- 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"

diff --git a/include/net/slirp.h b/include/net/slirp.h
index 2ca09b65b7f4573ab19f1ac277e44b0cf0709eec..ac9d44964fd2a78d56945935de7d728cac325c86 100644 (file)
--- 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"
 

diff --git a/qapi/qapi-dealloc-visitor.h b/include/qapi/dealloc-visitor.h
similarity index 95%
rename from qapi/qapi-dealloc-visitor.h
rename to include/qapi/dealloc-visitor.h
index 5842bc79bde6ed346d6a2de51bb96965553bf33e..cf4c36d2d3482113b13d8c8cc8e9418172f0aba0 100644 (file)
--- a/qapi/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;
 

diff --git a/error.h b/include/qapi/error.h
similarity index 100%
rename from error.h
rename to include/qapi/error.h

diff --git a/qapi/opts-visitor.h b/include/qapi/opts-visitor.h
similarity index 96%
rename from qapi/opts-visitor.h
rename to include/qapi/opts-visitor.h
index ea1a395573bc7ee1e992f9aea2a88b5f5188e478..31fa4c5628043cecebb83ade42165077eaebac78 100644 (file)
--- a/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;

diff --git a/qapi/qmp-input-visitor.h b/include/qapi/qmp-input-visitor.h
similarity index 91%
rename from qapi/qmp-input-visitor.h
rename to include/qapi/qmp-input-visitor.h
index e0a48a5f3b1cd8d174b5b191cea3e0da980f0e04..3ed499cc42d27e7d80f6397e67d3f1bbb3c5af5d 100644 (file)
--- a/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;
 

diff --git a/qapi/qmp-output-visitor.h b/include/qapi/qmp-output-visitor.h
similarity index 91%
rename from qapi/qmp-output-visitor.h
rename to include/qapi/qmp-output-visitor.h
index 4a649c2504a4d32ec50f9506c7adce995e93da7c..22667706ab99642af33442e0928559c20e36f7d0 100644 (file)
--- a/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;
 

diff --git a/qapi/qmp-core.h b/include/qapi/qmp/dispatch.h
similarity index 93%
rename from qapi/qmp-core.h
rename to include/qapi/qmp/dispatch.h
index 00446cff9be8ab638e52f23c0d98cef4594f22d5..1ce11f5df00828f333aea6b8c4176d60cc9a7773 100644 (file)
--- a/qapi/qmp-core.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 **);
 

diff --git a/json-lexer.h b/include/qapi/qmp/json-lexer.h
similarity index 94%
rename from json-lexer.h
rename to include/qapi/qmp/json-lexer.h
index 10bc0a77984df5e607b3382c9b455907fa4edbc2..cdff0460a8389993220d51bf64651daf8a3c11e2 100644 (file)
--- a/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,

diff --git a/json-parser.h b/include/qapi/qmp/json-parser.h
similarity index 90%
rename from json-parser.h
rename to include/qapi/qmp/json-parser.h
index 8f2b5ec4bcb43e4ed012d5621d5c82958b06ec25..44d88f346859f4aea17b5d64ab19f3c4ff9b0eac 100644 (file)
--- a/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);

diff --git a/json-streamer.h b/include/qapi/qmp/json-streamer.h
similarity index 93%
rename from json-streamer.h
rename to include/qapi/qmp/json-streamer.h
index f09bc4daec98aae800d86820d728e11336672f91..823f7d7fa42b32e057560564a0436c9f0ed3d2e3 100644 (file)
--- a/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
 {

diff --git a/qbool.h b/include/qapi/qmp/qbool.h
similarity index 94%
rename from qbool.h
rename to include/qapi/qmp/qbool.h
index fe66fcd4551dccb86c8603199268b0b34e8d7dbe..c4eaab9bb9f03ff76e50e235d0981063be4328bc 100644 (file)
--- a/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;

diff --git a/qdict.h b/include/qapi/qmp/qdict.h
similarity index 97%
rename from qdict.h
rename to include/qapi/qmp/qdict.h
index 929d8d22f50bde2370d89060b29fb083a548d814..c815981d3073f255ba8ee277f8112063d4f8051b 100644 (file)
--- a/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>
 

diff --git a/qerror.h b/include/qapi/qmp/qerror.h
similarity index 99%
rename from qerror.h
rename to include/qapi/qmp/qerror.h
index 8db4309aef34679a81812dee5c56fba3033b5745..d912297590449b0d1c54aff16c5cd0283fcd275e 100644 (file)
--- a/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>
 

diff --git a/qfloat.h b/include/qapi/qmp/qfloat.h
similarity index 94%
rename from qfloat.h
rename to include/qapi/qmp/qfloat.h
index 9d6787659c52202ac7ddbfb5b6c31511f75b2b24..a8658443dc206518a4748fe64f5c6757bc876485 100644 (file)
--- a/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;

diff --git a/qint.h b/include/qapi/qmp/qint.h
similarity index 94%
rename from qint.h
rename to include/qapi/qmp/qint.h
index 6b1a15c088be387fd4fdacd47ebd5a9372798099..48a41b0f2aed45bfc90e3d6838e204728bc2ee58 100644 (file)
--- a/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;

diff --git a/qjson.h b/include/qapi/qmp/qjson.h
similarity index 91%
rename from qjson.h
rename to include/qapi/qmp/qjson.h
index 1190d8a86c2b2edeb787375ffd13aadf66e7a55c..0473374bf275d2a9673264ad81f1c726b8a248c4 100644 (file)
--- a/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);

diff --git a/qlist.h b/include/qapi/qmp/qlist.h
similarity index 98%
rename from qlist.h
rename to include/qapi/qmp/qlist.h
index 74089471df2f8246e71abe0b1947c1b5d888c8e8..ffa0846d48d4a683bbe063a52acc0ea7e561c675 100644 (file)
--- a/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"
 

diff --git a/qobject.h b/include/qapi/qmp/qobject.h
similarity index 100%
rename from qobject.h
rename to include/qapi/qmp/qobject.h

diff --git a/qstring.h b/include/qapi/qmp/qstring.h
similarity index 96%
rename from qstring.h
rename to include/qapi/qmp/qstring.h
index 84ccd96d61fd2f3b73b6e129dbb4097437288957..0e690f4849807f45d05cab443f381ffd63c6d6e9 100644 (file)
--- a/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;

diff --git a/qemu-objects.h b/include/qapi/qmp/types.h
similarity index 60%
rename from qemu-objects.h
rename to include/qapi/qmp/types.h
index c53fbaa2175507e626d78c516fbd786f5479d2b0..7782ec5a602b6fc031129943ce7ae2ec99d0a9ed 100644 (file)
--- a/qemu-objects.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 */

diff --git a/qapi/string-input-visitor.h b/include/qapi/string-input-visitor.h
similarity index 95%
rename from qapi/string-input-visitor.h
rename to include/qapi/string-input-visitor.h
index d269d42cef90021d0fee8da8b9a4db9d7becbead..089243c09ebecf52e72084e71ae7cc1ca5816299 100644 (file)
--- a/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;
 

diff --git a/qapi/string-output-visitor.h b/include/qapi/string-output-visitor.h
similarity index 95%
rename from qapi/string-output-visitor.h
rename to include/qapi/string-output-visitor.h
index 88684541105554c1a277692ea74d17121341cb51..ec81e42b60a4a9ac06900015ee0c0fbe8fa8af11 100644 (file)
--- a/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;
 

diff --git a/qapi/qapi-visit-impl.h b/include/qapi/visitor-impl.h
similarity index 98%
rename from qapi/qapi-visit-impl.h
rename to include/qapi/visitor-impl.h
index 9337d62e75f28f3e689170b9a60cd46aad29f599..5159964863eb774057e5b1badc6c700a87c2f4d7 100644 (file)
--- a/qapi/qapi-visit-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
 {

diff --git a/qapi/qapi-visit-core.h b/include/qapi/visitor.h
similarity index 99%
rename from qapi/qapi-visit-core.h
rename to include/qapi/visitor.h
index 602debe753347aa7a79db5f4e868badfdb051963..1fef18c08fa90e0207d860d40c030deda7858e57 100644 (file)
--- a/qapi/qapi-visit-core.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

diff --git a/include/qemu/rng.h b/include/qemu/rng.h
index d094bf8d4c5dedb48b15867ee9007cfdb38a6983..37912971e0ecfd53f27787e32cb4dcc61a134fad 100644 (file)
--- 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) \

diff --git a/include/ui/console.h b/include/ui/console.h
index 777881d4a3fb899e7ef99dc8ff96af42585585f4..eff5cc92d637723db8b78e62e4130a875f79af2d 100644 (file)
--- 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 */
 

diff --git a/json-lexer.c b/json-lexer.c
index 3cd3285825d1f8433da982eba6059169bd6776c3..440df60392b1df4f2af44eb9d2a891d3001d4731 100644 (file)
--- 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)
 

diff --git a/json-parser.c b/json-parser.c
index 457291b161ad464416833f25c6e2ce51b3252cec..05279c11eb52d2759c581431a2ca6e020648e2b4 100644 (file)
--- 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
 {

diff --git a/json-streamer.c b/json-streamer.c
index c255c7818f3af4c6cd9dfca71ee55e8dd63bbb7c..1b2f9b1d107c3cf09721e653bdc8b94a426e1481 100644 (file)
--- 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)

diff --git a/migration.h b/migration.h
index c3a23cc6c8fa8f0ee601e82b26d1b722985676cd..af444d444b8f03705b9f09790e52071bfbb013d1 100644 (file)
--- 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"
 

diff --git a/monitor.c b/monitor.c
index 6546f8c30b92e66d2f287cb5cc03894b18673781..7d5c8a622c3f5d787183280b9a2fb17920174571 100644 (file)
--- 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"

diff --git a/monitor.h b/monitor.h
index 4595c217edde8d1991ae8776c17c781c1dcdf102..7c29d9db34df16c7362d634e5f2739839a928671 100644 (file)
--- 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"
 

diff --git a/net/net.c b/net/net.c
index a4395be140a7da3b5d2138b13c9b1ff6d7efae7a..ead7e96fe1ebd0cc768682d60b5c341c4368de3e 100644 (file)
--- 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)

diff --git a/pixman b/pixman
index a5e5179b5624c99c812e9bf6e7b907e355a811e8..97336fad32acf802003855cd8bd6477fa49a12e3 160000 (submodule)
--- a/pixman
+++ b/pixman
@@ -1 +1 @@
-Subproject commit a5e5179b5624c99c812e9bf6e7b907e355a811e8
+Subproject commit 97336fad32acf802003855cd8bd6477fa49a12e3

diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index 6ccb8a1c338941a2fdecc03049c596e5c8395437..f8149ce455f600993656f6b6cc0984d241bb4624 100644 (file)
--- 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

diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c
index 7c44042619789d0dfabef9ef95280258612e16aa..98f2a58efd2610e81a96c78ae2e854cb81fbfb7e 100644 (file)
--- 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
 {

diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 4649fb71b7af496b38b730cce2bd84fde2d399e5..401ee6e597bb617dabc1c5c98bf9742e2d9181fd 100644 (file)
--- 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)

diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index 40859946862d6c4d1006826511a1989959c89666..921de33bce6ab1ef4ef47c29fb730cfd78c0b138 100644 (file)
--- 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)
 {

diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index 107d8d361b8c10bb8c671d2233d5638129d78c9e..808790903691275a574764771cb4e1dda1da9101 100644 (file)
--- 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
 

diff --git a/qapi/qmp-output-visitor.c b/qapi/qmp-output-visitor.c
index 2bce9d5db1d75aa24425ff93302b165cfc211d54..8015e3f88d5bef1327b504f3f1a41b916b6306b8 100644 (file)
--- 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
 {

diff --git a/qapi/qmp-registry.c b/qapi/qmp-registry.c
index c2c31b420d4b3a31ccc8b40f90857faeb400d62c..70cdbca470ef584fda11e8c76a243a2d52ac4030 100644 (file)
--- 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);

diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
index 497eb9a60a590555d19b53bc3a02f5a29f9d0a16..8f1bc4133307ae8603657bc4e0014898a2b509a2 100644 (file)
--- 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
 {

diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c
index 34e525eadd00bb3e2c148804ee47966734bb1e30..921653d4256ed28f1e822c77127a67797c1e89ee 100644 (file)
--- 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
 {

diff --git a/qbool.c b/qbool.c
index 590cd716eadde40749aadcacc72ddc54efed68c4..a3d2afa827ff13b6511425e728d99a750af4f045 100644 (file)
--- 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);

diff --git a/qdict.c b/qdict.c
index 4bf308b61c6227961323d38b48542f0d24fee674..fa7a62cff442766cf36742b5e21f77e9efa800fb 100644 (file)
--- 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"
 

diff --git a/qemu-char.h b/qemu-char.h
index a121e04cdc15f5d49b2556d36d23b0f635cb2137..3e230a13195b274d87d5217ef64d460331c6ae4f 100644 (file)
--- 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 */

diff --git a/qemu-config.c b/qemu-config.c
index b4ce0d8034ef5f72a6322b0cc05b3a2cfff23d93..ceec6bd1551d9e7cae07dfc8756a7be253252692 100644 (file)
--- 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",

diff --git a/qemu-config.h b/qemu-config.h
index eb50eca838a8cdccf675588f7ac70f6ab17c0539..584491a29bc4495644775d87d421f856866fe6ba 100644 (file)
--- 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;

diff --git a/qemu-img.c b/qemu-img.c
index c989a5256480bb13881347e611a59d33921178e3..a13bc788cf6e6b1bc7b9c430ece29e049a8f638b 100644 (file)
--- 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"

diff --git a/qemu-option.c b/qemu-option.c
index 94557cfde794be4c67bc79a234e47f274a60c4f7..ebd35370637735af195e6880951f925839a3eab7 100644 (file)
--- 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"
 
 /*

diff --git a/qemu-option.h b/qemu-option.h
index 002dd07ee5f92e684f79736ca49251446d5d99c8..ca0dc041dd4166b831edbcb30ad9b61c92392721 100644 (file)
--- 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,

diff --git a/qemu_socket.h b/qemu_socket.h
index 02490ad06c3a7592b50cba3bad1502c4a94c35e2..42899fe138c99729bb8435cdb07c8e87ce4ca33f 100644 (file)
--- 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);

diff --git a/qerror.c b/qerror.c
index 08185047b4bed6b24dde0034b0bae37bb1aae508..8c781042779aedcb571c97cdb71ac8a0c0f2749c 100644 (file)
--- 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);

diff --git a/qfloat.c b/qfloat.c
index 98338f3b71a442971e5a69e5d85f78c80194ff85..7de0992dba7f1302cea3a0f366ba26d01e4ee2d9 100644 (file)
--- 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);

diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 726930a909371e1daf3f57458f62e43b5a793def..cedf2ccf288a27d6738c9fd46eef33fa993364a4 100644 (file)
--- 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"
 

diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 5bd8fb27f2c9176808b8d5f771debfe96e3ead20..7e8ecb3b40e84c95c612787181aad132b4235607 100644 (file)
--- 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

diff --git a/qga/commands.c b/qga/commands.c
index 46b0b083bc409c3e53963f870a3dc7f85340f58f..7ffb35e4af8a15a15f9a18f5d3fed3b21650205a 100644 (file)
--- 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

diff --git a/qga/guest-agent-core.h b/qga/guest-agent-core.h
index 49a7abee955d750665dfb36b22aefc6dee9898fa..8934163375e9b880eff728f7974b0b110c432917 100644 (file)
--- 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

diff --git a/qga/main.c b/qga/main.c
index 9b59a524619cab1f25ff3ae87a1ee2227785f1be..ead58cc11fd772ed3d42c44349996409c63119ba 100644 (file)
--- 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"

diff --git a/qint.c b/qint.c
index ee51804fbe9f5a9593b2d277aff9050cc756bc21..86b9b04f0b6214a88c223e6a3420ed7085016231 100644 (file)
--- 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);

diff --git a/qjson.c b/qjson.c
index f9c8e77516160e9a254e711ed88ad1bb05dfc8f4..83a6b4f7c1df228a41253aecc1c71e16e61c27eb 100644 (file)
--- 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
 {

diff --git a/qlist.c b/qlist.c
index b48ec5b91426af7086faf8df0459196b0c1946c4..c5ac2115af4ae974183301b83a17dbbce67ec32c 100644 (file)
--- 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"
 

diff --git a/qom/object.c b/qom/object.c
index 8d3036dcf448f13d6a32059f0b3b9c55057b2ba8..932f8b30de2ef9ce5c6feb1f519ed2af4eb63375 100644 (file)
--- 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 0689914e15d74b8e2423f214d6a83071e0a8a993..f0fa652157da83572bc0c8056e39f5b65fd6786c 100644 (file)
--- 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"
 

diff --git a/qstring.c b/qstring.c
index b7e12e40158200362b196aa566c3024d89360472..5f7376c336fec182320c98cba097008e318869c1 100644 (file)
--- 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);

diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 5d034c2c213233ec1e6a1f0e2921c69136477261..eccc28daee8393c0bf96c9de4b550f9850634c21 100644 (file)
--- 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"
 

diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 6bc239187463ead5797d51661ff017db7e334bb5..9e19920970cc6e71190cc364d52bdc79c120fa3f 100644 (file)
--- 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"
 

diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index f1aabb3813a8025f5b202112610cfb6f82d6a362..a276540a1846403fc5a48ebe1e6ae6981f2c2a8b 100644 (file)
--- 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)))

diff --git a/stubs/arch-query-cpu-def.c b/stubs/arch-query-cpu-def.c
index 47b524628d7aab6ecfbe2d146376e88b6d60ceb5..6eca8527d2626ac2be0311464a920d7cd6fff4c4 100644 (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)
 {

diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h
index 5901140480494439d860d5098c6f12921ed9ff41..3a7bc6aef4e06555083d9af0d733ac4ef76cac0c 100644 (file)
--- 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"

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index e968006ed0cb6f82fec3a811e9f386f183b6da8a..150c4dfb0cd60b646c9e82b8bbbf601f1d8f4782 100644 (file)
--- 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"

diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h
index ebb5ad312429d6371c243a853609fbb72defa3ff..c7b17501532b812ce0cf61c3cf3dc111bafe3c17 100644 (file)
--- 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"
 

diff --git a/tests/check-qdict.c b/tests/check-qdict.c
index fc0d27653840274ac9fd5f1acd98c7382c828a25..dc5f05a85fa4c2d5ff9d746d533675a67908a830 100644 (file)
--- a/tests/check-qdict.c
+++ b/tests/check-qdict.c
@@ -11,9 +11,9 @@
  */
 #include <glib.h>
 
-#include "qint.h"
-#include "qdict.h"
-#include "qstring.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qstring.h"
 #include "qemu-common.h"
 
 /*

diff --git a/tests/check-qfloat.c b/tests/check-qfloat.c
index cdc66ea10bd67f02ba6f20be57eeb3739dd39865..6404ac8df6013b4c1afaad8c70cf04dcb82bf961 100644 (file)
--- a/tests/check-qfloat.c
+++ b/tests/check-qfloat.c
@@ -12,7 +12,7 @@
  */
 #include <glib.h>
 
-#include "qfloat.h"
+#include "qapi/qmp/qfloat.h"
 #include "qemu-common.h"
 
 /*

diff --git a/tests/check-qint.c b/tests/check-qint.c
index 5a27119ae24996c6c5db1fdd4efe034a28ae8bbd..86868844abbfd2ef333d80a8301d46a9f84130de 100644 (file)
--- a/tests/check-qint.c
+++ b/tests/check-qint.c
@@ -11,7 +11,7 @@
  */
 #include <glib.h>
 
-#include "qint.h"
+#include "qapi/qmp/qint.h"
 #include "qemu-common.h"
 
 /*

diff --git a/tests/check-qjson.c b/tests/check-qjson.c
index 3b896f5f9c922b575ff88e127db89d8e099b610b..32ffb436df6ff6999c61ff5245bd82004c77cbb2 100644 (file)
--- a/tests/check-qjson.c
+++ b/tests/check-qjson.c
@@ -10,13 +10,13 @@
  */
 #include <glib.h>
 
-#include "qstring.h"
-#include "qint.h"
-#include "qdict.h"
-#include "qlist.h"
-#include "qfloat.h"
-#include "qbool.h"
-#include "qjson.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/qjson.h"
 
 #include "qemu-common.h"
 

diff --git a/tests/check-qlist.c b/tests/check-qlist.c
index 501ba262da0b5ab0b90e95511affb139b117047a..b9c05d43fd6fbfa97f969a0d8dfcc26c7a7e656f 100644 (file)
--- a/tests/check-qlist.c
+++ b/tests/check-qlist.c
@@ -11,8 +11,8 @@
  */
 #include <glib.h>
 
-#include "qint.h"
-#include "qlist.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qlist.h"
 
 /*
  * Public Interface test-cases

diff --git a/tests/check-qstring.c b/tests/check-qstring.c
index addad6c6737a9584ba4159d450b82826365be353..95dc9e3e7b81b4b567fc9989546b8dedfef6573d 100644 (file)
--- a/tests/check-qstring.c
+++ b/tests/check-qstring.c
@@ -11,7 +11,7 @@
  */
 #include <glib.h>
 
-#include "qstring.h"
+#include "qapi/qmp/qstring.h"
 #include "qemu-common.h"
 
 /*

diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c
index bf41034c62604e81ff3079a3276c25334ad4433e..61b533a0711323eead1c5da01c70208a2b4d974f 100644 (file)
--- a/tests/test-qmp-commands.c
+++ b/tests/test-qmp-commands.c
@@ -1,8 +1,8 @@
 #include <glib.h>
 #include "qemu-common.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
 #include "test-qmp-commands.h"
-#include "qapi/qmp-core.h"
+#include "qapi/qmp/dispatch.h"
 #include "module.h"
 #include "qapi/qmp-input-visitor.h"
 #include "tests/test-qapi-types.h"

diff --git a/tests/test-qmp-input-strict.c b/tests/test-qmp-input-strict.c
index 86f24d821caeaeaf51439631df50ba73e34ba2b3..6f68963a3d1c33e80a68b278463bec4e669c11ab 100644 (file)
--- a/tests/test-qmp-input-strict.c
+++ b/tests/test-qmp-input-strict.c
@@ -18,7 +18,7 @@
 #include "qapi/qmp-input-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
 
 typedef struct TestInputVisitorData {
     QObject *obj;

diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c
index 6568c9907c9244c09ee9f383e8cd165869937864..955a4c0b0aff16b8aac4afffb6ef472773eb0172 100644 (file)
--- a/tests/test-qmp-input-visitor.c
+++ b/tests/test-qmp-input-visitor.c
@@ -17,7 +17,7 @@
 #include "qapi/qmp-input-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
 
 typedef struct TestInputVisitorData {
     QObject *obj;

diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c
index 84b1f41894f3bcba64e7c6fa648d32fc53b5d8cd..71367e6efa6644893fa6d798ac2989dee67214ae 100644 (file)
--- a/tests/test-qmp-output-visitor.c
+++ b/tests/test-qmp-output-visitor.c
@@ -16,7 +16,7 @@
 #include "qapi/qmp-output-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
 
 typedef struct TestOutputVisitorData {
     QmpOutputVisitor *qov;

diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c
index 36b3792980712b8983384f2a433ac7df220bf958..899feda57955744ff820204bf4e0cc0168a46073 100644 (file)
--- a/tests/test-string-input-visitor.c
+++ b/tests/test-string-input-visitor.c
@@ -17,7 +17,7 @@
 #include "qapi/string-input-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
 
 typedef struct TestInputVisitorData {
     StringInputVisitor *siv;

diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c
index afb557a00f80614b68b4a5a21200498eda75a46b..79d815f8885eacb4e36dd41f197cfccb1d7f8318 100644 (file)
--- a/tests/test-string-output-visitor.c
+++ b/tests/test-string-output-visitor.c
@@ -16,7 +16,7 @@
 #include "qapi/string-output-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
 
 typedef struct TestOutputVisitorData {
     StringOutputVisitor *sov;

diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c
index a251f878e1fc4ec77f642f057826fa603dd1f1e2..3c6b8df607477a2c49f8678f83748e75580fcd72 100644 (file)
--- a/tests/test-visitor-serialization.c
+++ b/tests/test-visitor-serialization.c
@@ -18,7 +18,7 @@
 #include "qemu-common.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
 #include "qapi/qmp-input-visitor.h"
 #include "qapi/qmp-output-visitor.h"
 #include "qapi/string-input-visitor.h"

diff --git a/ui/input.c b/ui/input.c
index 58d3b4709cb263cee6fbdf4a5daa955ad3a67032..65950af9af2749424ec8307c9d650ca8f4ca4141 100644 (file)
--- a/ui/input.c
+++ b/ui/input.c
@@ -25,7 +25,7 @@
 #include "sysemu.h"
 #include "monitor.h"
 #include "ui/console.h"
-#include "error.h"
+#include "qapi/error.h"
 #include "qmp-commands.h"
 #include "qapi-types.h"
 

diff --git a/ui/spice-core.c b/ui/spice-core.c
index ec925ecbb02369688619b616de5323e2227c96ab..0550805b3855ba287d4d86ec323779ba5a727009 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -29,10 +29,10 @@
 #include "qemu-x509.h"
 #include "qemu_socket.h"
 #include "qmp-commands.h"
-#include "qint.h"
-#include "qbool.h"
-#include "qstring.h"
-#include "qjson.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qjson.h"
 #include "notify.h"
 #include "migration.h"
 #include "monitor.h"

diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index 62d0fde77fe03384aabd14fcdb190963a07acf8c..09199ef584c3e0af1d9d443572f6dc0610b77d5e 100644 (file)
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -45,7 +45,7 @@
 #endif
 
 #include "bswap.h"
-#include "qint.h"
+#include "qapi/qmp/qint.h"
 #include "vnc.h"
 #include "vnc-enc-tight.h"
 #include "vnc-palette.h"

diff --git a/ui/vnc-palette.h b/ui/vnc-palette.h
index b82dc5db916b300ef69f854d48c7b4a4fb42a2e6..bfc7fe642e36117b53a9c251a84c2728c65313e5 100644 (file)
--- a/ui/vnc-palette.h
+++ b/ui/vnc-palette.h
@@ -29,7 +29,7 @@
 #ifndef VNC_PALETTE_H
 #define VNC_PALETTE_H
 
-#include "qlist.h"
+#include "qapi/qmp/qlist.h"
 #include "qemu-queue.h"
 #include <stdint.h>
 #include <stdbool.h>

diff --git a/ui/vnc.c b/ui/vnc.c
index 04afcffc52a6e2b4d3d71653d0f12d4b2ed13f72..dad2ddee29775abe0390230e97d55ab255368b1c 100644 (file)
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -30,7 +30,7 @@
 #include "qemu_socket.h"
 #include "qemu-timer.h"
 #include "acl.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
 #include "qmp-commands.h"
 #include "osdep.h"
 

diff --git a/vl.c b/vl.c
index 6713220905b27a7269bd464d1df0f844cbc38020..975767a44b621a81a7fd4362a7245bd61b603001 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
 #include "audio/audio.h"
 #include "migration.h"
 #include "kvm.h"
-#include "qjson.h"
+#include "qapi/qmp/qjson.h"
 #include "qemu-option.h"
 #include "qemu-config.h"
 #include "qemu-options.h"