Commit 7b1b5d19 authored by Paolo Bonzini's avatar Paolo Bonzini

qapi: move include files to include/qobject/

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent cb9c377f
......@@ -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"
......
......@@ -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
......
......@@ -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,
......
......@@ -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;
......
......@@ -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"
......
......@@ -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 */
......
......@@ -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"
/*
......
......@@ -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)
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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);
......
......@@ -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"
......
......@@ -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 */
......
......@@ -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,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
{
......
......@@ -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);
......
......@@ -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"
......
......@@ -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"
......
......@@ -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,
......
......@@ -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"
......
#include "qdev.h"
#include "qdev-addr.h"
#include "hwaddr.h"
#include "qapi/qapi-visit-core.h"
#include "qapi/visitor.h"
/* --- target physical address --- */
......
......@@ -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,
......
#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)
......
......@@ -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;
......
......@@ -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
......
......@@ -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 "qapi/qmp/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 "qapi/qmp/qdict.h"
#include "qemu-option.h"
#include "qapi-types.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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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 **);
......
......@@ -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,
......
......@@ -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);
......
......@@ -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
{
......
......@@ -15,7 +15,7 @@
#define QBOOL_H
#include <stdint.h>
#include "qobject.h"
#include "qapi/qmp/qobject.h"
typedef struct QBool {
QObject_HEAD;
......
......@@ -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>
......
......@@ -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>
......
......@@ -15,7 +15,7 @@
#define QFLOAT_H
#include <stdint.h>
#include "qobject.h"
#include "qapi/qmp/qobject.h"
typedef struct QFloat {
QObject_HEAD;
......
......@@ -14,7 +14,7 @@
#define QINT_H
#include <stdint.h>
#include "qobject.h"
#include "qapi/qmp/qobject.h"
typedef struct QInt {
QObject_HEAD;
......
......@@ -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);
......
......@@ -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"
......
......@@ -14,7 +14,7 @@
#define QSTRING_H
#include <stdint.h>
#include "qobject.h"
#include "qapi/qmp/qobject.h"
typedef struct QString {
QObject_HEAD;
......
......@@ -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 */
......@@ -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;
......
......@@ -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;
......
......@@ -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
{
......
......@@ -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
......
......@@ -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) \
......
......@@ -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 */
......
......@@ -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)
......
......@@ -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
{
......
......@@ -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)
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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)
......
pixman @ 97336fad
Subproject commit a5e5179b5624c99c812e9bf6e7b907e355a811e8
Subproject commit 97336fad32acf802003855cd8bd6477fa49a12e3
......@@ -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
......
......@@ -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
{
......
......@@ -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"