From b72fe9e690db5082fdd0476074230cf2c65508bf Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 4 May 2016 18:49:18 +0200 Subject: migration/qjson: Drop gratuitous use of QOM All the use of QOM buys us here is the ability to destroy the thing with object_unref(OBJECT(vmdesc)). Not worth the notational overhead. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Dr. David Alan Gilbert Message-Id: <1462380558-2030-3-git-send-email-armbru@redhat.com> Signed-off-by: Amit Shah --- migration/qjson.c | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) (limited to 'migration/qjson.c') diff --git a/migration/qjson.c b/migration/qjson.c index cb479fe0eb..5cae55af07 100644 --- a/migration/qjson.c +++ b/migration/qjson.c @@ -26,17 +26,12 @@ #include "qemu/osdep.h" #include "qapi/qmp/qstring.h" #include "migration/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 */ @@ -100,41 +95,19 @@ const char *qjson_get_str(QJSON *json) 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); + QJSON *json = g_new0(QJSON, 1); json->str = qstring_from_str("{ "); json->omit_comma = true; + return json; } -static void qjson_finalizefn(Object *obj) +void qjson_finish(QJSON *json) { - QJSON *json = QJSON(obj); - - qobject_decref(QOBJECT(json->str)); + json_end_object(json); } -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) +void qjson_destroy(QJSON *json) { - type_register_static(&qjson_type_info); + g_free(json); } - -type_init(qjson_register_types) -- cgit v1.2.1