From patchwork Wed Nov 11 17:29:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 38160 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 34907B6F2B for ; Thu, 12 Nov 2009 05:01:36 +1100 (EST) Received: from localhost ([127.0.0.1]:49177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8HVd-00026G-Kp for incoming@patchwork.ozlabs.org; Wed, 11 Nov 2009 13:01:33 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8H0i-0006zF-J7 for qemu-devel@nongnu.org; Wed, 11 Nov 2009 12:29:37 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8H0b-0006sR-0j for qemu-devel@nongnu.org; Wed, 11 Nov 2009 12:29:33 -0500 Received: from [199.232.76.173] (port=48462 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8H0a-0006sC-AH for qemu-devel@nongnu.org; Wed, 11 Nov 2009 12:29:28 -0500 Received: from e38.co.us.ibm.com ([32.97.110.159]:55958) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1N8H0Z-00022T-Po for qemu-devel@nongnu.org; Wed, 11 Nov 2009 12:29:28 -0500 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e38.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id nABHOpfv019610 for ; Wed, 11 Nov 2009 10:24:51 -0700 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id nABHT98f024950 for ; Wed, 11 Nov 2009 10:29:10 -0700 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id nABHT9MZ007401 for ; Wed, 11 Nov 2009 10:29:09 -0700 Received: from localhost.localdomain (sig-9-65-32-87.mts.ibm.com [9.65.32.87]) by d03av03.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id nABHT43L007179; Wed, 11 Nov 2009 10:29:09 -0700 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Wed, 11 Nov 2009 11:29:02 -0600 Message-Id: <1257960543-26373-10-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1257960543-26373-1-git-send-email-aliguori@us.ibm.com> References: <1257960543-26373-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Anthony Liguori , Luiz Capitulino Subject: [Qemu-devel] [PATCH 10/11] Add a QObject JSON wrapper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This provides a QObject interface for creating QObjects from a JSON expression. Signed-off-by: Anthony Liguori --- Makefile | 2 +- qjson.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qjson.h | 23 +++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletions(-) create mode 100644 qjson.c create mode 100644 qjson.h diff --git a/Makefile b/Makefile index 6d68a1f..3818c51 100644 --- a/Makefile +++ b/Makefile @@ -136,7 +136,7 @@ obj-y += qemu-char.o aio.o savevm.o obj-y += msmouse.o ps2.o obj-y += qdev.o qdev-properties.o obj-y += qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o json-lexer.o -obj-y += json-streamer.o json-parser.o +obj-y += json-streamer.o json-parser.o qjson.o obj-y += qemu-config.o obj-$(CONFIG_BRLAPI) += baum.o diff --git a/qjson.c b/qjson.c new file mode 100644 index 0000000..45207f2 --- /dev/null +++ b/qjson.c @@ -0,0 +1,60 @@ +/* + * QObject JSON integration + * + * Copyright IBM, Corp. 2009 + * + * Authors: + * Anthony Liguori + * + * 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 "json-lexer.h" +#include "json-parser.h" +#include "json-streamer.h" +#include "qjson.h" + +typedef struct JSONParsingState +{ + JSONMessageParser parser; + va_list *ap; + QObject *result; +} JSONParsingState; + +static void parse_json(JSONMessageParser *parser, QList *tokens) +{ + JSONParsingState *s = container_of(parser, JSONParsingState, parser); + s->result = json_parser_parse(tokens, s->ap); +} + +QObject *qobject_from_json(const char *string) +{ + JSONParsingState state = {}; + + json_message_parser_init(&state.parser, parse_json); + json_message_parser_feed(&state.parser, string, strlen(string)); + json_message_parser_flush(&state.parser); + json_message_parser_destroy(&state.parser); + + return state.result; +} + +QObject *qobject_from_jsonf(const char *string, ...) +{ + JSONParsingState state = {}; + va_list ap; + + va_start(ap, string); + state.ap = ≈ + + json_message_parser_init(&state.parser, parse_json); + json_message_parser_feed(&state.parser, string, strlen(string)); + json_message_parser_flush(&state.parser); + json_message_parser_destroy(&state.parser); + + va_end(ap); + + return state.result; +} diff --git a/qjson.h b/qjson.h new file mode 100644 index 0000000..38be643 --- /dev/null +++ b/qjson.h @@ -0,0 +1,23 @@ +/* + * QObject JSON integration + * + * Copyright IBM, Corp. 2009 + * + * Authors: + * Anthony Liguori + * + * 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. + * + */ + +#ifndef QJSON_H +#define QJSON_H + +#include "qobject.h" + +QObject *qobject_from_json(const char *string); +QObject *qobject_from_jsonf(const char *string, ...) + __attribute__((__format__ (__printf__, 1, 2))); + +#endif /* QJSON_H */