diff options
author | Markus Armbruster <armbru@redhat.com> | 2016-05-04 18:49:17 +0200 |
---|---|---|
committer | Amit Shah <amit.shah@redhat.com> | 2016-05-23 14:16:09 +0530 |
commit | 17b74b98676aee5bc470b173b1e528d2fce2cf18 (patch) | |
tree | 169cb6088b47644ab33817b2489b0227f7105207 /qjson.c | |
parent | 65603e2fc18b48e6e55a3dd693669413141694ec (diff) | |
download | qemu-17b74b98676aee5bc470b173b1e528d2fce2cf18.tar.gz qemu-17b74b98676aee5bc470b173b1e528d2fce2cf18.tar.bz2 qemu-17b74b98676aee5bc470b173b1e528d2fce2cf18.zip |
migration: Move qjson.[ch] to migration/
Type QJSON lets you build JSON text. Its interface mirrors (a subset
of) abstract JSON syntax.
QAPI output visitors also produce JSON text. They assert their
preconditions and invariants, and therefore abort on incorrect use.
Contrastingly, QJSON does *not* detect incorrect use. It happily
produces invalid JSON then. This is what migration wants.
QJSON was designed for migration, and migration is its only user.
Move it to migration/ for proper coverage by MAINTAINERS, and to deter
accidental use outside migration.
[Pointed out by Eric: QJSON was added in commits 0457d07..b174257
-- Amit]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <1462380558-2030-2-git-send-email-armbru@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Diffstat (limited to 'qjson.c')
-rw-r--r-- | qjson.c | 129 |
1 files changed, 0 insertions, 129 deletions
diff --git a/qjson.c b/qjson.c deleted file mode 100644 index b65ca6ee5e..0000000000 --- a/qjson.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * QEMU JSON writer - * - * Copyright Alexander Graf - * - * Authors: - * Alexander Graf <agraf@suse.de> - * - * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. - * See the COPYING.LIB file in the top-level directory. - * - */ - -#include "qemu/osdep.h" -#include <qapi/qmp/qstring.h> -#include <glib.h> -#include <qjson.h> -#include <qemu/module.h> -#include <qom/object.h> - -struct QJSON { - Object obj; - QString *str; - bool omit_comma; -}; - -#define QJSON(obj) OBJECT_CHECK(QJSON, (obj), TYPE_QJSON) - -static void json_emit_element(QJSON *json, const char *name) -{ - /* Check whether we need to print a , before an element */ - if (json->omit_comma) { - json->omit_comma = false; - } else { - qstring_append(json->str, ", "); - } - - if (name) { - qstring_append(json->str, "\""); - qstring_append(json->str, name); - qstring_append(json->str, "\" : "); - } -} - -void json_start_object(QJSON *json, const char *name) -{ - json_emit_element(json, name); - qstring_append(json->str, "{ "); - json->omit_comma = true; -} - -void json_end_object(QJSON *json) -{ - qstring_append(json->str, " }"); - json->omit_comma = false; -} - -void json_start_array(QJSON *json, const char *name) -{ - json_emit_element(json, name); - qstring_append(json->str, "[ "); - json->omit_comma = true; -} - -void json_end_array(QJSON *json) -{ - qstring_append(json->str, " ]"); - json->omit_comma = false; -} - -void json_prop_int(QJSON *json, const char *name, int64_t val) -{ - json_emit_element(json, name); - qstring_append_int(json->str, val); -} - -void json_prop_str(QJSON *json, const char *name, const char *str) -{ - json_emit_element(json, name); - qstring_append_chr(json->str, '"'); - qstring_append(json->str, str); - qstring_append_chr(json->str, '"'); -} - -const char *qjson_get_str(QJSON *json) -{ - return qstring_get_str(json->str); -} - -QJSON *qjson_new(void) -{ - QJSON *json = QJSON(object_new(TYPE_QJSON)); - return json; -} - -void qjson_finish(QJSON *json) -{ - json_end_object(json); -} - -static void qjson_initfn(Object *obj) -{ - QJSON *json = QJSON(obj); - - json->str = qstring_from_str("{ "); - json->omit_comma = true; -} - -static void qjson_finalizefn(Object *obj) -{ - QJSON *json = QJSON(obj); - - qobject_decref(QOBJECT(json->str)); -} - -static const TypeInfo qjson_type_info = { - .name = TYPE_QJSON, - .parent = TYPE_OBJECT, - .instance_size = sizeof(QJSON), - .instance_init = qjson_initfn, - .instance_finalize = qjson_finalizefn, -}; - -static void qjson_register_types(void) -{ - type_register_static(&qjson_type_info); -} - -type_init(qjson_register_types) |