@@ -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);
@@ -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"
@@ -11,7 +11,7 @@
*/
#include "qemu-common.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qjson.h"
#include "qdict.h"
#include "qapi-types.h"
@@ -32,7 +32,7 @@
#include "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,
@@ -28,7 +28,7 @@
#include "net/net.h"
#include "qdev.h"
#include "sysemu.h"
-#include "error.h"
+#include "qapi/error.h"
int qdev_hotplug = 0;
static bool qdev_hot_added = false;
@@ -4,9 +4,9 @@
#include "hw.h"
#include "qemu-queue.h"
#include "qemu-option.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "qemu/object.h"
-#include "error.h"
+#include "qapi/error.h"
typedef struct Property Property;
@@ -23,7 +23,7 @@
*/
#include <hw/hw.h>
-#include "error.h"
+#include "qapi/error.h"
#include "memory.h"
#define ST01_V_RETRACE 0x08
similarity index 95%
rename from qapi/qapi-dealloc-visitor.h
rename to 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/visit-core.h"
typedef struct QapiDeallocVisitor QapiDeallocVisitor;
similarity index 100%
rename from error.h
rename to include/qapi/error.h
similarity index 96%
rename from qapi/opts-visitor.h
rename to include/qapi/opts-visitor.h
@@ -13,7 +13,7 @@
#ifndef OPTS_VISITOR_H
#define OPTS_VISITOR_H
-#include "qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "qemu-option.h"
typedef struct OptsVisitor OptsVisitor;
similarity index 98%
rename from qapi/qmp-core.h
rename to include/qapi/qmp-core.h
@@ -16,7 +16,7 @@
#include "qobject.h"
#include "qdict.h"
-#include "error.h"
+#include "qapi/error.h"
typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);
similarity index 95%
rename from qapi/qmp-input-visitor.h
rename to include/qapi/qmp-input-visitor.h
@@ -14,7 +14,7 @@
#ifndef QMP_INPUT_VISITOR_H
#define QMP_INPUT_VISITOR_H
-#include "qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "qobject.h"
typedef struct QmpInputVisitor QmpInputVisitor;
similarity index 95%
rename from qapi/qmp-output-visitor.h
rename to include/qapi/qmp-output-visitor.h
@@ -14,7 +14,7 @@
#ifndef QMP_OUTPUT_VISITOR_H
#define QMP_OUTPUT_VISITOR_H
-#include "qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "qobject.h"
typedef struct QmpOutputVisitor QmpOutputVisitor;
similarity index 95%
rename from qapi/string-input-visitor.h
rename to 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/visit-core.h"
typedef struct StringInputVisitor StringInputVisitor;
similarity index 95%
rename from qapi/string-output-visitor.h
rename to 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/visit-core.h"
typedef struct StringOutputVisitor StringOutputVisitor;
similarity index 94%
rename from qapi/qapi-types-core.h
rename to include/qapi/types-core.h
@@ -15,7 +15,7 @@
#define QAPI_TYPES_CORE_H
#include "qemu-common.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qerror.h"
#endif
similarity index 99%
rename from qapi/qapi-visit-core.h
rename to include/qapi/visit-core.h
@@ -13,7 +13,7 @@
#ifndef QAPI_VISITOR_CORE_H
#define QAPI_VISITOR_CORE_H
-#include "qapi/qapi-types-core.h"
+#include "qapi/types-core.h"
#include <stdlib.h>
typedef struct GenericList
similarity index 90%
rename from qapi/qapi-visit-impl.h
rename to include/qapi/visit-impl.h
@@ -12,8 +12,8 @@
#ifndef QAPI_VISITOR_IMPL_H
#define QAPI_VISITOR_IMPL_H
-#include "qapi/qapi-types-core.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/types-core.h"
+#include "qapi/visit-core.h"
void input_type_enum(Visitor *v, int *obj, const char *strings[],
const char *kind, const char *name, Error **errp);
@@ -6,7 +6,7 @@
#include "monitor.h"
#include "trace.h"
#include "qapi-types.h"
-#include "error.h"
+#include "qapi/error.h"
/* keyboard/mouse support */
@@ -16,7 +16,7 @@
#include "qemu-common.h"
#include "qlist.h"
-#include "error.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);
@@ -17,7 +17,7 @@
#include "qdict.h"
#include "qemu-common.h"
#include "notify.h"
-#include "error.h"
+#include "qapi/error.h"
#include "vmstate.h"
#include "qapi-types.h"
@@ -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)
@@ -10,10 +10,10 @@
*
*/
-#include "opts-visitor.h"
+#include "qapi/opts-visitor.h"
#include "qemu-queue.h"
#include "qemu-option-internal.h"
-#include "qapi-visit-impl.h"
+#include "qapi/visit-impl.h"
struct OptsVisitor
@@ -11,7 +11,7 @@
*
*/
-#include "qapi-dealloc-visitor.h"
+#include "qapi/dealloc-visitor.h"
#include "qemu-queue.h"
#include "qemu-common.h"
#include "qemu-objects.h"
@@ -11,8 +11,8 @@
*
*/
-#include "qapi/qapi-visit-core.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/visit-core.h"
+#include "qapi/visit-impl.h"
void visit_start_handle(Visitor *v, void **obj, const char *kind,
const char *name, Error **errp)
@@ -15,7 +15,7 @@
#include "qapi/qmp-core.h"
#include "json-parser.h"
#include "qapi-types.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qerror.h"
static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
@@ -11,8 +11,8 @@
*
*/
-#include "qmp-input-visitor.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/qmp-input-visitor.h"
+#include "qapi/visit-impl.h"
#include "qemu-queue.h"
#include "qemu-common.h"
#include "qemu-objects.h"
@@ -11,8 +11,8 @@
*
*/
-#include "qmp-output-visitor.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/qmp-output-visitor.h"
+#include "qapi/visit-impl.h"
#include "qemu-queue.h"
#include "qemu-common.h"
#include "qemu-objects.h"
@@ -11,8 +11,8 @@
*/
#include "qemu-common.h"
-#include "string-input-visitor.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/string-input-visitor.h"
+#include "qapi/visit-impl.h"
#include "qerror.h"
struct StringInputVisitor
@@ -11,8 +11,8 @@
*/
#include "qemu-common.h"
-#include "string-output-visitor.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/string-output-visitor.h"
+#include "qapi/visit-impl.h"
#include "qerror.h"
struct StringOutputVisitor
@@ -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",
@@ -1,7 +1,7 @@
#ifndef QEMU_CONFIG_H
#define QEMU_CONFIG_H
-#include "error.h"
+#include "qapi/error.h"
#include "qemu-option.h"
extern QemuOptsList qemu_fsdev_opts;
@@ -29,7 +29,7 @@
#include "qemu-common.h"
#include "qemu-error.h"
#include "qemu-objects.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qerror.h"
#include "qemu-option-internal.h"
@@ -28,7 +28,7 @@
#include <stdint.h>
#include "qemu-queue.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qdict.h"
enum QEMUOptionParType {
@@ -27,7 +27,7 @@ int inet_aton(const char *cp, struct in_addr *ia);
#endif /* !_WIN32 */
#include "qemu-option.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qerror.h"
/* misc helpers */
@@ -15,7 +15,7 @@
#include "qdict.h"
#include "qstring.h"
#include "qemu-error.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qapi-types.h"
#include <stdarg.h>
@@ -12,7 +12,7 @@
#include "qemu/object.h"
#include "qemu-common.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "qapi/string-input-visitor.h"
#include "qapi/string-output-visitor.h"
@@ -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/visit-core.h"
#include "qapi/qmp-input-visitor.h"
#include "qapi/qmp-output-visitor.h"
@@ -343,7 +343,7 @@ def gen_command_decl_prologue(header, guard, prefix=""):
#include "%(prefix)sqapi-types.h"
#include "qdict.h"
-#include "error.h"
+#include "qapi/error.h"
''',
header=basename(header), guard=guardname(header), prefix=prefix)
@@ -368,10 +368,10 @@ def gen_command_def_prologue(prefix="", proxy=False):
#include "qemu-objects.h"
#include "qapi/qmp-core.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visit-core.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"
@@ -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"
@@ -321,7 +321,7 @@ fdecl.write(mcgen('''
#ifndef %(guard)s
#define %(guard)s
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "%(prefix)sqapi-types.h"
''',
prefix=prefix, guard=guardname(h_file)))
@@ -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"
@@ -27,7 +27,7 @@
#include "qemu-option.h"
#include "qemu-config.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "arch_init.h"
#include "hyperv.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"
@@ -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"
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- blockdev.h | 2 +- dump.c | 2 +- error.c | 2 +- hw/pci-hotplug.c | 2 +- hw/qdev.c | 2 +- hw/qdev.h | 4 ++-- hw/vga_int.h | 2 +- .../qapi/dealloc-visitor.h | 2 +- error.h => include/qapi/error.h | 0 {qapi => include/qapi}/opts-visitor.h | 2 +- {qapi => include/qapi}/qmp-core.h | 2 +- {qapi => include/qapi}/qmp-input-visitor.h | 2 +- {qapi => include/qapi}/qmp-output-visitor.h | 2 +- {qapi => include/qapi}/string-input-visitor.h | 2 +- {qapi => include/qapi}/string-output-visitor.h | 2 +- .../qapi-types-core.h => include/qapi/types-core.h | 2 +- .../qapi-visit-core.h => include/qapi/visit-core.h | 2 +- .../qapi-visit-impl.h => include/qapi/visit-impl.h | 4 ++-- include/ui/console.h | 2 +- json-parser.h | 2 +- migration.h | 2 +- net/net.c | 2 +- qapi/opts-visitor.c | 4 ++-- qapi/qapi-dealloc-visitor.c | 2 +- qapi/qapi-visit-core.c | 4 ++-- qapi/qmp-dispatch.c | 2 +- qapi/qmp-input-visitor.c | 4 ++-- qapi/qmp-output-visitor.c | 4 ++-- qapi/string-input-visitor.c | 4 ++-- qapi/string-output-visitor.c | 4 ++-- qemu-config.c | 2 +- qemu-config.h | 2 +- qemu-option.c | 2 +- qemu-option.h | 2 +- qemu_socket.h | 2 +- qerror.h | 2 +- qom/object.c | 2 +- qom/qom-qobject.c | 2 +- scripts/qapi-commands.py | 6 +++--- scripts/qapi-types.py | 2 +- scripts/qapi-visit.py | 2 +- target-i386/cpu-qom.h | 2 +- target-i386/cpu.c | 2 +- target-openrisc/cpu.h | 2 +- ui/input.c | 2 +- 45 files changed, 54 insertions(+), 54 deletions(-) rename qapi/qapi-dealloc-visitor.h => include/qapi/dealloc-visitor.h (95%) rename error.h => include/qapi/error.h (100%) rename {qapi => include/qapi}/opts-visitor.h (96%) rename {qapi => include/qapi}/qmp-core.h (98%) rename {qapi => include/qapi}/qmp-input-visitor.h (95%) rename {qapi => include/qapi}/qmp-output-visitor.h (95%) rename {qapi => include/qapi}/string-input-visitor.h (95%) rename {qapi => include/qapi}/string-output-visitor.h (95%) rename qapi/qapi-types-core.h => include/qapi/types-core.h (94%) rename qapi/qapi-visit-core.h => include/qapi/visit-core.h (99%) rename qapi/qapi-visit-impl.h => include/qapi/visit-impl.h (90%)