@@ -5,9 +5,7 @@ universal-obj-y += qemu-log.o
#######################################################################
# QObject
-qobject-obj-y = qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o
-qobject-obj-y += qjson.o json-lexer.o json-streamer.o json-parser.o
-qobject-obj-y += qerror.o error.o qemu-error.o
+qobject-obj-y = qobject/ error.o qemu-error.o
universal-obj-y += $(qobject-obj-y)
@@ -224,6 +222,7 @@ vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
QEMU_CFLAGS+=$(GLIB_CFLAGS)
nested-vars += \
+ qobject-obj-y \
qga-obj-y \
qom-obj-y \
qapi-obj-y \
@@ -30,7 +30,7 @@
#include "balloon.h"
#include "trace.h"
#include "qmp-commands.h"
-#include "qjson.h"
+#include "qobject/qjson.h"
static QEMUBalloonEvent *balloon_event_fn;
static QEMUBalloonStatus *balloon_stat_fn;
@@ -28,7 +28,7 @@
#include "block_int.h"
#include "blockjob.h"
#include "module.h"
-#include "qjson.h"
+#include "qobject/qjson.h"
#include "sysemu.h"
#include "notify.h"
#include "qemu-coroutine.h"
@@ -5,7 +5,7 @@
#include "qemu-common.h"
#include "qemu-option.h"
#include "qemu-coroutine.h"
-#include "qobject.h"
+#include "qobject/qobject.h"
#include "qapi-types.h"
/* block.c */
@@ -28,7 +28,7 @@
#include "aes.h"
#include "block/qcow2.h"
#include "qemu-error.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "trace.h"
/*
@@ -15,7 +15,7 @@
#include "qemu-timer.h"
#include "trace.h"
#include "qed.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "migration.h"
static void qed_aio_cancel(BlockDriverAIOCB *blockacb)
@@ -30,7 +30,7 @@
#include "qemu-coroutine.h"
#include "qemu-timer.h"
#include "qapi-types.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "monitor.h"
#define BLOCK_FLAG_ENCRYPT 1
@@ -12,7 +12,7 @@
#include "blockdev.h"
#include "hw/block-common.h"
#include "monitor.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "sysemu.h"
#include "qmp-commands.h"
#include "trace.h"
@@ -11,10 +11,10 @@
#include "hw/block-common.h"
#include "blockjob.h"
#include "monitor.h"
-#include "qerror.h"
+#include "qobject/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"
@@ -30,7 +30,7 @@
#include "block.h"
#include "blockjob.h"
#include "block_int.h"
-#include "qjson.h"
+#include "qobject/qjson.h"
#include "qemu-coroutine.h"
#include "qmp-commands.h"
#include "qemu-timer.h"
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "dump.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "qmp-commands.h"
/* we need this function in hmp.c */
@@ -12,10 +12,10 @@
#include "qemu-common.h"
#include "qapi/error.h"
-#include "qjson.h"
-#include "qdict.h"
+#include "qobject/qjson.h"
+#include "qobject/qdict.h"
#include "qapi-types.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
struct Error
{
@@ -16,7 +16,7 @@
#include "qemu-common.h"
#include "qapi-types.h"
-#include "qdict.h"
+#include "qobject/qdict.h"
void hmp_info_name(Monitor *mon);
void hmp_info_version(Monitor *mon);
@@ -22,7 +22,7 @@
#include "msix.h"
#include "kvm.h"
#include "migration.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "event_notifier.h"
#include "qemu-char.h"
@@ -19,7 +19,7 @@
*/
#include "sysemu.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
#include "monitor.h"
#include "pci_bridge.h"
#include "pcie.h"
@@ -1,6 +1,6 @@
#include "net/net.h"
#include "qdev.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "blockdev.h"
#include "hw/block-common.h"
#include "qemu-char.h"
@@ -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"
@@ -3,7 +3,7 @@
#include "qemu-queue.h"
#include "qemu-common.h"
-#include "qdict.h"
+#include "qobject/qdict.h"
#include "qemu-option.h"
#include "net/queue.h"
#include "vmstate.h"
@@ -25,7 +25,7 @@
#define QEMU_NET_SLIRP_H
#include "qemu-common.h"
-#include "qdict.h"
+#include "qobject/qdict.h"
#include "qemu-option.h"
#include "qapi-types.h"
@@ -14,8 +14,8 @@
#ifndef QMP_CORE_H
#define QMP_CORE_H
-#include "qobject.h"
-#include "qdict.h"
+#include "qobject/qobject.h"
+#include "qobject/qdict.h"
#include "qapi/error.h"
typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);
@@ -15,7 +15,7 @@
#define QMP_INPUT_VISITOR_H
#include "qapi/visit-core.h"
-#include "qobject.h"
+#include "qobject/qobject.h"
typedef struct QmpInputVisitor QmpInputVisitor;
@@ -15,7 +15,7 @@
#define QMP_OUTPUT_VISITOR_H
#include "qapi/visit-core.h"
-#include "qobject.h"
+#include "qobject/qobject.h"
typedef struct QmpOutputVisitor QmpOutputVisitor;
similarity index 61%
rename from qemu-objects.h
rename to 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 "qobject/qobject.h"
+#include "qobject/qint.h"
+#include "qobject/qfloat.h"
+#include "qobject/qbool.h"
+#include "qobject/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qjson.h"
#endif /* QEMU_OBJECTS_H */
@@ -16,6 +16,6 @@
#include "qemu-common.h"
#include "qapi/error.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#endif
similarity index 94%
rename from json-lexer.h
rename to include/qobject/json-lexer.h
@@ -14,8 +14,8 @@
#ifndef QEMU_JSON_LEXER_H
#define QEMU_JSON_LEXER_H
-#include "qstring.h"
-#include "qlist.h"
+#include "qobject/qstring.h"
+#include "qobject/qlist.h"
typedef enum json_token_type {
JSON_OPERATOR = 100,
similarity index 94%
rename from json-parser.h
rename to include/qobject/json-parser.h
@@ -15,7 +15,7 @@
#define QEMU_JSON_PARSER_H
#include "qemu-common.h"
-#include "qlist.h"
+#include "qobject/qlist.h"
#include "qapi/error.h"
QObject *json_parser_parse(QList *tokens, va_list *ap);
similarity index 94%
rename from json-streamer.h
rename to include/qobject/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 "qobject/qlist.h"
+#include "qobject/json-lexer.h"
typedef struct JSONMessageParser
{
similarity index 94%
rename from qbool.h
rename to include/qobject/qbool.h
@@ -15,7 +15,7 @@
#define QBOOL_H
#include <stdint.h>
-#include "qobject.h"
+#include "qobject/qobject.h"
typedef struct QBool {
QObject_HEAD;
similarity index 97%
rename from qdict.h
rename to include/qobject/qdict.h
@@ -13,8 +13,8 @@
#ifndef QDICT_H
#define QDICT_H
-#include "qobject.h"
-#include "qlist.h"
+#include "qobject/qobject.h"
+#include "qobject/qlist.h"
#include "qemu-queue.h"
#include <stdint.h>
similarity index 99%
rename from qerror.h
rename to include/qobject/qerror.h
@@ -12,8 +12,8 @@
#ifndef QERROR_H
#define QERROR_H
-#include "qdict.h"
-#include "qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qemu-error.h"
#include "qapi/error.h"
#include "qapi-types.h"
similarity index 94%
rename from qfloat.h
rename to include/qobject/qfloat.h
@@ -15,7 +15,7 @@
#define QFLOAT_H
#include <stdint.h>
-#include "qobject.h"
+#include "qobject/qobject.h"
typedef struct QFloat {
QObject_HEAD;
similarity index 94%
rename from qint.h
rename to include/qobject/qint.h
@@ -14,7 +14,7 @@
#define QINT_H
#include <stdint.h>
-#include "qobject.h"
+#include "qobject/qobject.h"
typedef struct QInt {
QObject_HEAD;
similarity index 92%
rename from qjson.h
rename to include/qobject/qjson.h
@@ -16,8 +16,8 @@
#include <stdarg.h>
#include "compiler.h"
-#include "qobject.h"
-#include "qstring.h"
+#include "qobject/qobject.h"
+#include "qobject/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);
similarity index 98%
rename from qlist.h
rename to include/qobject/qlist.h
@@ -13,7 +13,7 @@
#ifndef QLIST_H
#define QLIST_H
-#include "qobject.h"
+#include "qobject/qobject.h"
#include "qemu-queue.h"
#include "qemu-common.h"
#include "qemu-queue.h"
similarity index 100%
rename from qobject.h
rename to include/qobject/qobject.h
similarity index 96%
rename from qstring.h
rename to include/qobject/qstring.h
@@ -14,7 +14,7 @@
#define QSTRING_H
#include <stdint.h>
-#include "qobject.h"
+#include "qobject/qobject.h"
typedef struct QString {
QObject_HEAD;
@@ -1,7 +1,7 @@
#ifndef CONSOLE_H
#define CONSOLE_H
-#include "qdict.h"
+#include "qobject/qdict.h"
#include "notify.h"
#include "monitor.h"
#include "trace.h"
@@ -14,7 +14,7 @@
#ifndef QEMU_MIGRATION_H
#define QEMU_MIGRATION_H
-#include "qdict.h"
+#include "qobject/qdict.h"
#include "qemu-common.h"
#include "notify.h"
#include "qapi/error.h"
@@ -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 "qobject/qint.h"
+#include "qobject/qfloat.h"
+#include "qobject/qlist.h"
+#include "qobject/qbool.h"
+#include "qobject/qstring.h"
+#include "qobject/qjson.h"
+#include "qobject/json-streamer.h"
+#include "qobject/json-parser.h"
#include "osdep.h"
#include "cpu.h"
#include "trace.h"
@@ -2,8 +2,8 @@
#define MONITOR_H
#include "qemu-common.h"
-#include "qerror.h"
-#include "qdict.h"
+#include "qobject/qerror.h"
+#include "qobject/qdict.h"
#include "block.h"
#include "readline.h"
@@ -14,7 +14,7 @@
#include "qapi/dealloc-visitor.h"
#include "qemu-queue.h"
#include "qemu-common.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
typedef struct StackEntry
{
@@ -11,12 +11,12 @@
*
*/
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
#include "qapi/qmp-core.h"
-#include "json-parser.h"
+#include "qobject/json-parser.h"
#include "qapi-types.h"
#include "qapi/error.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
{
@@ -15,8 +15,8 @@
#include "qapi/visit-impl.h"
#include "qemu-queue.h"
#include "qemu-common.h"
-#include "qemu-objects.h"
-#include "qerror.h"
+#include "qapi/qmp-types.h"
+#include "qobject/qerror.h"
#define QIV_STACK_SIZE 1024
@@ -15,8 +15,8 @@
#include "qapi/visit-impl.h"
#include "qemu-queue.h"
#include "qemu-common.h"
-#include "qemu-objects.h"
-#include "qerror.h"
+#include "qapi/qmp-types.h"
+#include "qobject/qerror.h"
typedef struct QStackEntry
{
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "qapi/string-input-visitor.h"
#include "qapi/visit-impl.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
struct StringInputVisitor
{
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "qapi/string-output-visitor.h"
#include "qapi/visit-impl.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
struct StringOutputVisitor
{
@@ -5,8 +5,8 @@
#include "qemu-queue.h"
#include "qemu-option.h"
#include "qemu-config.h"
-#include "qobject.h"
-#include "qstring.h"
+#include "qobject/qobject.h"
+#include "qobject/qstring.h"
#include "main-loop.h"
/* character device */
@@ -23,7 +23,7 @@
*/
#include "qapi-visit.h"
#include "qapi/qmp-output-visitor.h"
-#include "qjson.h"
+#include "qobject/qjson.h"
#include "qemu-common.h"
#include "qemu-option.h"
#include "qemu-error.h"
@@ -28,9 +28,9 @@
#include "qemu-common.h"
#include "qemu-error.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
#include "qapi/error.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "qemu-option-internal.h"
/*
@@ -29,7 +29,7 @@
#include <stdint.h>
#include "qemu-queue.h"
#include "qapi/error.h"
-#include "qdict.h"
+#include "qobject/qdict.h"
enum QEMUOptionParType {
OPT_FLAG,
@@ -28,7 +28,7 @@ int inet_aton(const char *cp, struct in_addr *ia);
#include "qemu-option.h"
#include "qapi/error.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
/* misc helpers */
int qemu_socket(int domain, int type, int protocol);
@@ -17,7 +17,7 @@
#include <sys/wait.h>
#include "qga/guest-agent-core.h"
#include "qga-qmp-commands.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "qemu-queue.h"
#include "host-utils.h"
@@ -16,7 +16,7 @@
#include <powrprof.h>
#include "qga/guest-agent-core.h"
#include "qga-qmp-commands.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#ifndef SHTDN_REASON_FLAG_PLANNED
#define SHTDN_REASON_FLAG_PLANNED 0x80000000
@@ -13,7 +13,7 @@
#include <glib.h>
#include "qga/guest-agent-core.h"
#include "qga-qmp-commands.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
/* Note: in some situations, like with the fsfreeze, logging may be
* temporarilly disabled. if it is necessary that a command be able
@@ -20,14 +20,14 @@
#include <sys/wait.h>
#include <sys/stat.h>
#endif
-#include "json-streamer.h"
-#include "json-parser.h"
-#include "qint.h"
-#include "qjson.h"
+#include "qobject/json-streamer.h"
+#include "qobject/json-parser.h"
+#include "qobject/qint.h"
+#include "qobject/qjson.h"
#include "qga/guest-agent-core.h"
#include "module.h"
#include "signal.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "qapi/qmp-core.h"
#include "qga/channel.h"
#ifdef _WIN32
new file mode 100644
@@ -0,0 +1,4 @@
+qobject-obj-y = qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o
+qobject-obj-y += qjson.o json-lexer.o json-streamer.o json-parser.o
+qobject-obj-y += qerror.o
+
similarity index 98%
rename from json-lexer.c
rename to qobject/json-lexer.c
@@ -11,12 +11,12 @@
*
*/
-#include "qstring.h"
-#include "qlist.h"
-#include "qdict.h"
-#include "qint.h"
+#include "qobject/qstring.h"
+#include "qobject/qlist.h"
+#include "qobject/qdict.h"
+#include "qobject/qint.h"
#include "qemu-common.h"
-#include "json-lexer.h"
+#include "qobject/json-lexer.h"
#define MAX_TOKEN_SIZE (64ULL << 20)
similarity index 98%
rename from json-parser.c
rename to qobject/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 "qobject/qstring.h"
+#include "qobject/qint.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qfloat.h"
+#include "qobject/qbool.h"
+#include "qobject/json-parser.h"
+#include "qobject/json-lexer.h"
+#include "qobject/qerror.h"
typedef struct JSONParserContext
{
similarity index 95%
rename from json-streamer.c
rename to qobject/json-streamer.c
@@ -11,12 +11,12 @@
*
*/
-#include "qlist.h"
-#include "qint.h"
-#include "qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qint.h"
+#include "qobject/qdict.h"
#include "qemu-common.h"
-#include "json-lexer.h"
-#include "json-streamer.h"
+#include "qobject/json-lexer.h"
+#include "qobject/json-streamer.h"
#define MAX_TOKEN_SIZE (64ULL << 20)
#define MAX_NESTING (1ULL << 10)
similarity index 95%
rename from qbool.c
rename to qobject/qbool.c
@@ -11,8 +11,8 @@
*
*/
-#include "qbool.h"
-#include "qobject.h"
+#include "qobject/qbool.h"
+#include "qobject/qobject.h"
#include "qemu-common.h"
static void qbool_destroy_obj(QObject *obj);
similarity index 98%
rename from qdict.c
rename to qobject/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 "qobject/qint.h"
+#include "qobject/qfloat.h"
+#include "qobject/qdict.h"
+#include "qobject/qbool.h"
+#include "qobject/qstring.h"
+#include "qobject/qobject.h"
#include "qemu-queue.h"
#include "qemu-common.h"
similarity index 98%
rename from qerror.c
rename to qobject/qerror.c
@@ -11,8 +11,8 @@
*/
#include "monitor.h"
-#include "qjson.h"
-#include "qerror.h"
+#include "qobject/qjson.h"
+#include "qobject/qerror.h"
#include "qemu-common.h"
static void qerror_destroy_obj(QObject *obj);
similarity index 95%
rename from qfloat.c
rename to qobject/qfloat.c
@@ -11,8 +11,8 @@
*
*/
-#include "qfloat.h"
-#include "qobject.h"
+#include "qobject/qfloat.h"
+#include "qobject/qobject.h"
#include "qemu-common.h"
static void qfloat_destroy_obj(QObject *obj);
similarity index 95%
rename from qint.c
rename to qobject/qint.c
@@ -10,8 +10,8 @@
* See the COPYING.LIB file in the top-level directory.
*/
-#include "qint.h"
-#include "qobject.h"
+#include "qobject/qint.h"
+#include "qobject/qobject.h"
#include "qemu-common.h"
static void qint_destroy_obj(QObject *obj);
similarity index 96%
rename from qjson.c
rename to qobject/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 "qobject/json-lexer.h"
+#include "qobject/json-parser.h"
+#include "qobject/json-streamer.h"
+#include "qobject/qjson.h"
+#include "qobject/qint.h"
+#include "qobject/qlist.h"
+#include "qobject/qbool.h"
+#include "qobject/qfloat.h"
+#include "qobject/qdict.h"
typedef struct JSONParsingState
{
similarity index 98%
rename from qlist.c
rename to qobject/qlist.c
@@ -10,8 +10,8 @@
* See the COPYING.LIB file in the top-level directory.
*/
-#include "qlist.h"
-#include "qobject.h"
+#include "qobject/qlist.h"
+#include "qobject/qobject.h"
#include "qemu-queue.h"
#include "qemu-common.h"
similarity index 98%
rename from qstring.c
rename to qobject/qstring.c
@@ -10,8 +10,8 @@
* See the COPYING.LIB file in the top-level directory.
*/
-#include "qobject.h"
-#include "qstring.h"
+#include "qobject/qobject.h"
+#include "qobject/qstring.h"
#include "qemu-common.h"
static void qstring_destroy_obj(QObject *obj);
@@ -19,10 +19,10 @@
/* 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 "qobject/qobject.h"
+#include "qobject/qbool.h"
+#include "qobject/qint.h"
+#include "qobject/qstring.h"
#define MAX_INTERFACES 32
@@ -342,7 +342,7 @@ def gen_command_decl_prologue(header, guard, prefix=""):
#define %(guard)s
#include "%(prefix)sqapi-types.h"
-#include "qdict.h"
+#include "qobject/qdict.h"
#include "qapi/error.h"
''',
@@ -366,7 +366,7 @@ def gen_command_def_prologue(prefix="", proxy=False):
*
*/
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
#include "qapi/qmp-core.h"
#include "qapi/visit-core.h"
#include "qapi/qmp-output-visitor.h"
@@ -11,9 +11,9 @@
*/
#include <glib.h>
-#include "qint.h"
-#include "qdict.h"
-#include "qstring.h"
+#include "qobject/qint.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qemu-common.h"
/*
@@ -12,7 +12,7 @@
*/
#include <glib.h>
-#include "qfloat.h"
+#include "qobject/qfloat.h"
#include "qemu-common.h"
/*
@@ -11,7 +11,7 @@
*/
#include <glib.h>
-#include "qint.h"
+#include "qobject/qint.h"
#include "qemu-common.h"
/*
@@ -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 "qobject/qstring.h"
+#include "qobject/qint.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qfloat.h"
+#include "qobject/qbool.h"
+#include "qobject/qjson.h"
#include "qemu-common.h"
@@ -11,8 +11,8 @@
*/
#include <glib.h>
-#include "qint.h"
-#include "qlist.h"
+#include "qobject/qint.h"
+#include "qobject/qlist.h"
/*
* Public Interface test-cases
@@ -11,7 +11,7 @@
*/
#include <glib.h>
-#include "qstring.h"
+#include "qobject/qstring.h"
#include "qemu-common.h"
/*
@@ -1,5 +1,5 @@
#include <glib.h>
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
#include "test-qmp-commands.h"
#include "qapi/qmp-core.h"
#include "module.h"
@@ -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;
@@ -16,7 +16,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;
@@ -15,7 +15,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;
@@ -16,7 +16,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;
@@ -15,7 +15,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;
@@ -16,7 +16,7 @@
#include <float.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"
@@ -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 "qobject/qint.h"
+#include "qobject/qbool.h"
+#include "qobject/qstring.h"
+#include "qobject/qjson.h"
#include "notify.h"
#include "migration.h"
#include "monitor.h"
@@ -45,7 +45,7 @@
#endif
#include "bswap.h"
-#include "qint.h"
+#include "qobject/qint.h"
#include "vnc.h"
#include "vnc-enc-tight.h"
#include "vnc-palette.h"
@@ -29,7 +29,7 @@
#ifndef VNC_PALETTE_H
#define VNC_PALETTE_H
-#include "qlist.h"
+#include "qobject/qlist.h"
#include "qemu-queue.h"
#include <stdint.h>
@@ -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"
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
#include "audio/audio.h"
#include "migration.h"
#include "kvm.h"
-#include "qjson.h"
+#include "qobject/qjson.h"
#include "qemu-option.h"
#include "qemu-config.h"
#include "qemu-options.h"
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- Makefile.objs | 5 ++--- balloon.c | 2 +- block.c | 2 +- block.h | 2 +- block/qcow2.c | 2 +- block/qed.c | 2 +- block_int.h | 2 +- blockdev-nbd.c | 2 +- blockdev.c | 4 ++-- blockjob.c | 2 +- dump-stub.c | 2 +- error.c | 6 +++--- hmp.h | 2 +- hw/ivshmem.c | 2 +- hw/pcie_aer.c | 2 +- hw/qdev-properties.c | 2 +- hw/watchdog.c | 2 +- include/net/net.h | 2 +- include/net/slirp.h | 2 +- include/qapi/qmp-core.h | 4 ++-- include/qapi/qmp-input-visitor.h | 2 +- include/qapi/qmp-output-visitor.h | 2 +- qemu-objects.h => include/qapi/qmp-types.h | 16 ++++++++-------- include/qapi/types-core.h | 2 +- json-lexer.h => include/qobject/json-lexer.h | 4 ++-- json-parser.h => include/qobject/json-parser.h | 2 +- json-streamer.h => include/qobject/json-streamer.h | 4 ++-- qbool.h => include/qobject/qbool.h | 2 +- qdict.h => include/qobject/qdict.h | 4 ++-- qerror.h => include/qobject/qerror.h | 4 ++-- qfloat.h => include/qobject/qfloat.h | 2 +- qint.h => include/qobject/qint.h | 2 +- qjson.h => include/qobject/qjson.h | 4 ++-- qlist.h => include/qobject/qlist.h | 2 +- qobject.h => include/qobject/qobject.h | 0 qstring.h => include/qobject/qstring.h | 2 +- include/ui/console.h | 2 +- migration.h | 2 +- monitor.c | 16 ++++++++-------- monitor.h | 4 ++-- qapi/qapi-dealloc-visitor.c | 2 +- qapi/qmp-dispatch.c | 6 +++--- qapi/qmp-input-visitor.c | 4 ++-- qapi/qmp-output-visitor.c | 4 ++-- qapi/string-input-visitor.c | 2 +- qapi/string-output-visitor.c | 2 +- qemu-char.h | 4 ++-- qemu-img.c | 2 +- qemu-option.c | 4 ++-- qemu-option.h | 2 +- qemu_socket.h | 2 +- qga/commands-posix.c | 2 +- qga/commands-win32.c | 2 +- qga/commands.c | 2 +- qga/main.c | 10 +++++----- qobject/Makefile.objs | 4 ++++ json-lexer.c => qobject/json-lexer.c | 10 +++++----- json-parser.c => qobject/json-parser.c | 18 +++++++++--------- json-streamer.c => qobject/json-streamer.c | 10 +++++----- qbool.c => qobject/qbool.c | 4 ++-- qdict.c => qobject/qdict.c | 12 ++++++------ qerror.c => qobject/qerror.c | 4 ++-- qfloat.c => qobject/qfloat.c | 4 ++-- qint.c => qobject/qint.c | 4 ++-- qjson.c => qobject/qjson.c | 18 +++++++++--------- qlist.c => qobject/qlist.c | 4 ++-- qstring.c => qobject/qstring.c | 4 ++-- qom/object.c | 8 ++++---- scripts/qapi-commands.py | 4 ++-- tests/check-qdict.c | 6 +++--- tests/check-qfloat.c | 2 +- tests/check-qint.c | 2 +- tests/check-qjson.c | 14 +++++++------- tests/check-qlist.c | 4 ++-- tests/check-qstring.c | 2 +- tests/test-qmp-commands.c | 2 +- tests/test-qmp-input-strict.c | 2 +- tests/test-qmp-input-visitor.c | 2 +- tests/test-qmp-output-visitor.c | 2 +- tests/test-string-input-visitor.c | 2 +- tests/test-string-output-visitor.c | 2 +- tests/test-visitor-serialization.c | 2 +- ui/spice-core.c | 8 ++++---- ui/vnc-enc-tight.c | 2 +- ui/vnc-palette.h | 2 +- ui/vnc.c | 2 +- vl.c | 2 +- 87 files changed, 175 insertions(+), 172 deletions(-) rename qemu-objects.h => include/qapi/qmp-types.h (61%) rename json-lexer.h => include/qobject/json-lexer.h (94%) rename json-parser.h => include/qobject/json-parser.h (94%) rename json-streamer.h => include/qobject/json-streamer.h (94%) rename qbool.h => include/qobject/qbool.h (94%) rename qdict.h => include/qobject/qdict.h (97%) rename qerror.h => include/qobject/qerror.h (99%) rename qfloat.h => include/qobject/qfloat.h (94%) rename qint.h => include/qobject/qint.h (94%) rename qjson.h => include/qobject/qjson.h (92%) rename qlist.h => include/qobject/qlist.h (98%) rename qobject.h => include/qobject/qobject.h (100%) rename qstring.h => include/qobject/qstring.h (96%) create mode 100644 qobject/Makefile.objs rename json-lexer.c => qobject/json-lexer.c (98%) rename json-parser.c => qobject/json-parser.c (98%) rename json-streamer.c => qobject/json-streamer.c (95%) rename qbool.c => qobject/qbool.c (95%) rename qdict.c => qobject/qdict.c (98%) rename qerror.c => qobject/qerror.c (98%) rename qfloat.c => qobject/qfloat.c (95%) rename qint.c => qobject/qint.c (95%) rename qjson.c => qobject/qjson.c (96%) rename qlist.c => qobject/qlist.c (98%) rename qstring.c => qobject/qstring.c (98%)