diff options
| -rw-r--r-- | block.c | 1 | ||||
| -rw-r--r-- | include/qapi/qmp/qjson.h | 2 | ||||
| -rw-r--r-- | monitor.c | 1 | ||||
| -rw-r--r-- | qapi/qobject-input-visitor.c | 1 | ||||
| -rw-r--r-- | qemu-img.c | 1 | ||||
| -rw-r--r-- | qga/main.c | 1 | ||||
| -rw-r--r-- | qobject/qjson.c | 1 | ||||
| -rw-r--r-- | tests/check-qjson.c | 1 | ||||
| -rw-r--r-- | tests/libqtest.c | 1 | ||||
| -rw-r--r-- | tests/test-qobject-input-visitor.c | 1 | ||||
| -rw-r--r-- | tests/test-qobject-output-visitor.c | 1 | ||||
| -rw-r--r-- | tests/test-visitor-serialization.c | 1 | ||||
| -rw-r--r-- | ui/spice-core.c | 1 |
13 files changed, 11 insertions, 3 deletions
@@ -35,6 +35,7 @@ #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qstring.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" #include "qemu/notify.h" diff --git a/include/qapi/qmp/qjson.h b/include/qapi/qmp/qjson.h index 6b38b0f074..b274ac3a86 100644 --- a/include/qapi/qmp/qjson.h +++ b/include/qapi/qmp/qjson.h @@ -14,8 +14,6 @@ #ifndef QJSON_H #define QJSON_H -#include "qapi/qmp/qstring.h" - QObject *qobject_from_json(const char *string, Error **errp); QObject *qobject_from_jsonf(const char *string, ...) GCC_FMT_ATTR(1, 2); QObject *qobject_from_jsonv(const char *string, va_list *ap, Error **errp) @@ -56,6 +56,7 @@ #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h" diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index 3566eed365..023317b05f 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -26,6 +26,7 @@ #include "qapi/qmp/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/option.h" diff --git a/qemu-img.c b/qemu-img.c index c6bcfcd83e..a85eb3536e 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -32,6 +32,7 @@ #include "qapi/qmp/qjson.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/config-file.h" #include "qemu/option.h" diff --git a/qga/main.c b/qga/main.c index 72406a3c23..aa8e00c653 100644 --- a/qga/main.c +++ b/qga/main.c @@ -22,6 +22,7 @@ #include "qapi/qmp/json-parser.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qstring.h" #include "qga/guest-agent-core.h" #include "qemu/module.h" #include "qga-qmp-commands.h" diff --git a/qobject/qjson.c b/qobject/qjson.c index 77f796bbee..e1ce75651c 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -21,6 +21,7 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qemu/unicode.h" typedef struct JSONParsingState diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 26f5d4401e..a18ea47cb7 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -19,6 +19,7 @@ #include "qapi/qmp/qlit.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qemu-common.h" static void escaped_string(void) diff --git a/tests/libqtest.c b/tests/libqtest.c index b65374c634..f2c285374b 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -27,6 +27,7 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlist.h" +#include "qapi/qmp/qstring.h" #define MAX_IRQ 256 #define SOCKET_TIMEOUT 50 diff --git a/tests/test-qobject-input-visitor.c b/tests/test-qobject-input-visitor.c index 2e6f7f422f..3900be2610 100644 --- a/tests/test-qobject-input-visitor.c +++ b/tests/test-qobject-input-visitor.c @@ -21,6 +21,7 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" #include "test-qmp-introspect.h" #include "qmp-introspect.h" diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-output-visitor.c index 09a56d2d06..1b8a9ee372 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -21,6 +21,7 @@ #include "qapi/qmp/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" typedef struct TestOutputVisitorData { diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c index 928a82b2e6..dd7e51d4f5 100644 --- a/tests/test-visitor-serialization.c +++ b/tests/test-visitor-serialization.c @@ -18,6 +18,7 @@ #include "test-qapi-visit.h" #include "qapi/error.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" #include "qapi/string-input-visitor.h" diff --git a/ui/spice-core.c b/ui/spice-core.c index 7a53db070c..c4d67e678c 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -32,7 +32,6 @@ #include "qmp-commands.h" #include "qapi/error.h" #include "qapi/qmp/qbool.h" -#include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" #include "qemu/notify.h" #include "migration/misc.h" |