From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0fFb-00021n-IA for qemu-devel@nongnu.org; Thu, 23 Feb 2012 15:26:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S0fFZ-0000jI-SO for qemu-devel@nongnu.org; Thu, 23 Feb 2012 15:26:51 -0500 Received: from mail-pz0-f45.google.com ([209.85.210.45]:60149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0fFZ-0000fd-LV for qemu-devel@nongnu.org; Thu, 23 Feb 2012 15:26:49 -0500 Received: by mail-pz0-f45.google.com with SMTP id p14so1976039dad.4 for ; Thu, 23 Feb 2012 12:26:49 -0800 (PST) Sender: fluxion From: Michael Roth Date: Thu, 23 Feb 2012 14:22:24 -0600 Message-Id: <1330028546-13183-5-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1330028546-13183-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1330028546-13183-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 4/6] qapi: add String visitor coverage to serialization unit tests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com Signed-off-by: Michael Roth --- test-visitor-serialization.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/test-visitor-serialization.c b/test-visitor-serialization.c index 6ef57d0..b8ad16f 100644 --- a/test-visitor-serialization.c +++ b/test-visitor-serialization.c @@ -19,6 +19,8 @@ #include "qemu-objects.h" #include "qapi/qmp-input-visitor.h" #include "qapi/qmp-output-visitor.h" +#include "qapi/string-input-visitor.h" +#include "qapi/string-output-visitor.h" typedef struct PrimitiveType { union { @@ -666,6 +668,37 @@ static void qmp_cleanup(void *datap) qmp_input_visitor_cleanup(d->qiv); } +typedef struct StringSerializeData { + StringOutputVisitor *sov; + StringInputVisitor *siv; +} StringSerializeData; + +static void string_serialize(void *native_in, void **datap, + VisitorFunc visit, Error **errp) +{ + StringSerializeData *d = g_malloc0(sizeof(*d)); + + d->sov = string_output_visitor_new(); + visit(string_output_get_visitor(d->sov), &native_in, errp); + *datap = d; +} + +static void string_deserialize(void **native_out, void *datap, + VisitorFunc visit, Error **errp) +{ + StringSerializeData *d = datap; + + d->siv = string_input_visitor_new(string_output_get_string(d->sov)); + visit(string_input_get_visitor(d->siv), native_out, errp); +} + +static void string_cleanup(void *datap) +{ + StringSerializeData *d = datap; + string_output_visitor_cleanup(d->sov); + string_input_visitor_cleanup(d->siv); +} + /* visitor registration, test harness */ /* note: to function interchangeably as a serialization mechanism your @@ -680,6 +713,13 @@ static const SerializeOps visitors[] = { .cleanup = qmp_cleanup, .caps = VCAP_PRIMITIVES | VCAP_STRUCTURES | VCAP_LISTS }, + { + .type = "String", + .serialize = string_serialize, + .deserialize = string_deserialize, + .cleanup = string_cleanup, + .caps = VCAP_PRIMITIVES + }, { NULL } }; -- 1.7.4.1