From patchwork Thu Feb 23 20:22:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 142700 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3D910B709C for ; Fri, 24 Feb 2012 07:27:10 +1100 (EST) Received: from localhost ([::1]:48948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0fFs-0002Bq-2w for incoming@patchwork.ozlabs.org; Thu, 23 Feb 2012 15:27:08 -0500 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) Received-SPF: pass (google.com: domain of flukshun@gmail.com designates 10.68.74.138 as permitted sender) client-ip=10.68.74.138; Authentication-Results: mr.google.com; spf=pass (google.com: domain of flukshun@gmail.com designates 10.68.74.138 as permitted sender) smtp.mail=flukshun@gmail.com; dkim=pass header.i=flukshun@gmail.com Received: from mr.google.com ([10.68.74.138]) by 10.68.74.138 with SMTP id t10mr8412963pbv.126.1330028809336 (num_hops = 1); Thu, 23 Feb 2012 12:26:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=9YPeItLAejLcsOY5rzve9fLyy/oQQaFAg7kB+LHU+3c=; b=NyItUMwx9kOnWYE6Oz5gG4KKHqyfdUvZx07MrPJgDOVoiiLtVcFS8NUBI9vgvkbEUe pBSfpABe0v40yTEmDGNz/pw8zc0uf4RFFlNqorCkmQfX7PvMdDQj3Q7p7oETOrpp92sQ UKuNI1Gp4khLaL7RKw7dE2tqsi7KTgTUczE1Y= Received: by 10.68.74.138 with SMTP id t10mr6877953pbv.126.1330028809296; Thu, 23 Feb 2012 12:26:49 -0800 (PST) Received: from localhost.localdomain ([32.97.110.59]) by mx.google.com with ESMTPS id j9sm2304822pbp.43.2012.02.23.12.26.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Feb 2012 12:26:47 -0800 (PST) From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 23 Feb 2012 14:22:24 -0600 Message-Id: <1330028546-13183-5-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.1 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> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Cc: pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v2 4/6] qapi: add String visitor coverage to serialization unit tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 } };