From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFqry-0002tb-F0 for qemu-devel@nongnu.org; Wed, 13 Mar 2013 14:57:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFqrr-0003QI-Lv for qemu-devel@nongnu.org; Wed, 13 Mar 2013 14:57:46 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:53007) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFqrr-0003QD-FM for qemu-devel@nongnu.org; Wed, 13 Mar 2013 14:57:39 -0400 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 13 Mar 2013 12:57:02 -0600 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 1859E6E805F for ; Wed, 13 Mar 2013 14:56:43 -0400 (EDT) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2DIuiB4262834 for ; Wed, 13 Mar 2013 14:56:44 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2DIugKr029262 for ; Wed, 13 Mar 2013 14:56:42 -0400 From: Joel Schopp Date: Wed, 13 Mar 2013 13:56:27 -0500 Message-Id: <1363200988-17865-9-git-send-email-jschopp@linux.vnet.ibm.com> In-Reply-To: <1363200988-17865-1-git-send-email-jschopp@linux.vnet.ibm.com> References: <1363200988-17865-1-git-send-email-jschopp@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 8/9] asn1_test_visitor_serialization.diff List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Joel Schopp , Stefan Berger , Michael Tsirkin Add BER Visitor hooks to test-visitor-serialization Cc: Michael Tsirkin Cc: Stefan Berger Signed-off-by: Joel Schopp --- tests/Makefile | 2 +- tests/test-visitor-serialization.c | 72 ++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 567e36e..578d732 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -124,7 +124,7 @@ tests/test-qmp-output-visitor$(EXESUF): tests/test-qmp-output-visitor.o $(test-q tests/test-qmp-input-visitor$(EXESUF): tests/test-qmp-input-visitor.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a tests/test-qmp-input-strict$(EXESUF): tests/test-qmp-input-strict.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a tests/test-qmp-commands$(EXESUF): tests/test-qmp-commands.o tests/test-qmp-marshal.o $(test-qapi-obj-y) qapi-types.o qapi-visit.o libqemuutil.a libqemustub.a -tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serialization.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a +tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serialization.o $(test-qapi-obj-y) $(block-obj-y) libqemuutil.a libqemustub.a tests/test-mul64$(EXESUF): tests/test-mul64.o libqemuutil.a diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c index 3c6b8df..aae7464 100644 --- a/tests/test-visitor-serialization.c +++ b/tests/test-visitor-serialization.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "qemu-common.h" #include "test-qapi-types.h" @@ -23,6 +24,9 @@ #include "qapi/qmp-output-visitor.h" #include "qapi/string-input-visitor.h" #include "qapi/string-output-visitor.h" +#include "qapi/ber-input-visitor.h" +#include "qapi/ber-output-visitor.h" +#include "migration/qemu-file.h" typedef struct PrimitiveType { union { @@ -701,6 +705,59 @@ static void string_cleanup(void *datap) string_input_visitor_cleanup(d->siv); } + +typedef struct BERSerializeData { + BEROutputVisitor *sov; + QEMUFile *qoutfile; + BERInputVisitor *siv; + QEMUFile *qinfile; +} BERSerializeData; + +static void ber_serialize(void *native_in, void **datap, + VisitorFunc visit, Error **errp, BERTypePC ber_type_pc) +{ + BERSerializeData *d = g_malloc0(sizeof(*d)); + + d->qoutfile = qemu_bufopen("w", NULL); + d->sov = ber_output_visitor_new(d->qoutfile, ber_type_pc); + visit(ber_output_get_visitor(d->sov), &native_in, errp); + *datap = d; +} + +static void ber_primitive_serialize(void *native_in, void **datap, + VisitorFunc visit, Error **errp) +{ + ber_serialize(native_in, datap, visit, errp, BER_TYPE_PRIMITIVE); +} + +static void ber_constructed_serialize(void *native_in, void **datap, + VisitorFunc visit, Error **errp) +{ + ber_serialize(native_in, datap, visit, errp, BER_TYPE_CONSTRUCTED); +} + +static void ber_deserialize(void **native_out, void *datap, + VisitorFunc visit, Error **errp) +{ + BERSerializeData *d = datap; + const QEMUSizedBuffer *qsb = qemu_buf_get(d->qoutfile); + QEMUSizedBuffer *new_qsb = qsb_clone(qsb); + g_assert(new_qsb != NULL); + + d->qinfile = qemu_bufopen("r", new_qsb); + + d->siv = ber_input_visitor_new(d->qinfile, ~0); + visit(ber_input_get_visitor(d->siv), native_out, errp); +} + +static void ber_cleanup(void *datap) +{ + BERSerializeData *d = datap; + ber_output_visitor_cleanup(d->sov); + ber_input_visitor_cleanup(d->siv); +} + + /* visitor registration, test harness */ /* note: to function interchangeably as a serialization mechanism your @@ -722,6 +779,21 @@ static const SerializeOps visitors[] = { .cleanup = string_cleanup, .caps = VCAP_PRIMITIVES }, + { + .type = "ASN.1 BER primitives", + .serialize = ber_primitive_serialize, + .deserialize = ber_deserialize, + .cleanup = ber_cleanup, + .caps = VCAP_PRIMITIVES + }, + { + .type = "ASN.1 BER constructed", + .serialize = ber_constructed_serialize, + .deserialize = ber_deserialize, + .cleanup = ber_cleanup, + .caps = VCAP_PRIMITIVES | VCAP_LISTS + }, + { NULL } }; -- 1.7.10.4