From patchwork Fri Sep 21 14:07:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 185738 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 31B872C0081 for ; Sat, 22 Sep 2012 00:08:53 +1000 (EST) Received: from localhost ([::1]:33741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF3uU-0001XS-UL for incoming@patchwork.ozlabs.org; Fri, 21 Sep 2012 10:08:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF3u9-0001CT-4y for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:08:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF3u2-0007FU-W8 for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:08:29 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:34534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF3u2-0007Cw-Rt for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:08:22 -0400 Received: by mail-ie0-f173.google.com with SMTP id 17so990551iea.4 for ; Fri, 21 Sep 2012 07:08:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=VTP+4S8+2LcPQQ+3C4rAptdC+neVbG5gbQWiV0lcBaE=; b=ZkQG8qLe5I61dqP1rbC+TLmYfxnwhbpooaZv6rEGwUU4b5ab7zVKSZfqCxmuKia8r1 R28SxDCQaLGN+hHpTGdGznAGcXxPrulMfPBgQswJ0EuIAkOibXXb32Cz1xyrpqsYJrI4 tlXiSNQtfQPnZudfP0y9uKSY0DTQLZ/UUsbtqHuNe8XWsBq93YwI+uqV3aT/MvMPEfmY Ee2ytbbf9+AIG4ttlFqQv1LfIbqI5c5Ztw8BYBNyEpNt74n7rI2ZywYkdzcKL6aIWMjg PbdbZzxxtHSTwNnO32Luv0t5PhV/3gKRQZcg7bXG0RLGFRrykSg8PbHmgv3k7RpE4MfY Y4IA== Received: by 10.50.197.163 with SMTP id iv3mr1714325igc.52.1348236502707; Fri, 21 Sep 2012 07:08:22 -0700 (PDT) Received: from loki.morrigu.org (cpe-72-179-62-111.austin.res.rr.com. [72.179.62.111]) by mx.google.com with ESMTPS id ua5sm17301156igb.10.2012.09.21.07.08.18 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Sep 2012 07:08:20 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Fri, 21 Sep 2012 09:07:31 -0500 Message-Id: <1348236465-23124-9-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348236465-23124-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1348236465-23124-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.223.173 Cc: blauwirbel@gmail.com, peter.maydell@linaro.org, aliguori@us.ibm.com, eblake@redhat.com Subject: [Qemu-devel] [PATCH 08/22] qapi: add visitor interfaces for C arrays 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 Generally these will be serialized into lists, but the representation can be of any form so long as it can be deserialized into a single-dimension C array. Signed-off-by: Michael Roth --- qapi/qapi-visit-core.c | 25 +++++++++++++++++++++++++ qapi/qapi-visit-core.h | 8 ++++++++ 2 files changed, 33 insertions(+) diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 7a82b63..9a74ed0 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -311,3 +311,28 @@ void input_type_enum(Visitor *v, int *obj, const char *strings[], g_free(enum_str); *obj = value; } + +void visit_start_carray(Visitor *v, void **obj, const char *name, + size_t elem_count, size_t elem_size, Error **errp) +{ + g_assert(v->start_carray); + if (!error_is_set(errp)) { + v->start_carray(v, obj, name, elem_count, elem_size, errp); + } +} + +void visit_next_carray(Visitor *v, Error **errp) +{ + g_assert(v->next_carray); + if (!error_is_set(errp)) { + v->next_carray(v, errp); + } +} + +void visit_end_carray(Visitor *v, Error **errp) +{ + g_assert(v->end_carray); + if (!error_is_set(errp)) { + v->end_carray(v, errp); + } +} diff --git a/qapi/qapi-visit-core.h b/qapi/qapi-visit-core.h index 60aceda..5eb1616 100644 --- a/qapi/qapi-visit-core.h +++ b/qapi/qapi-visit-core.h @@ -43,6 +43,10 @@ struct Visitor void (*type_str)(Visitor *v, char **obj, const char *name, Error **errp); void (*type_number)(Visitor *v, double *obj, const char *name, Error **errp); + void (*start_carray)(Visitor *v, void **obj, const char *name, + size_t elem_count, size_t elem_size, Error **errp); + void (*next_carray)(Visitor *v, Error **errp); + void (*end_carray)(Visitor *v, Error **errp); /* May be NULL */ void (*start_optional)(Visitor *v, bool *present, const char *name, @@ -91,5 +95,9 @@ void visit_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp); void visit_type_bool(Visitor *v, bool *obj, const char *name, Error **errp); void visit_type_str(Visitor *v, char **obj, const char *name, Error **errp); void visit_type_number(Visitor *v, double *obj, const char *name, Error **errp); +void visit_start_carray(Visitor *v, void **obj, const char *name, + size_t elem_count, size_t elem_size, Error **errp); +void visit_next_carray(Visitor *v, Error **errp); +void visit_end_carray(Visitor *v, Error **errp); #endif