From patchwork Thu Oct 27 17:06:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 122187 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 F09FFB6F95 for ; Fri, 28 Oct 2011 04:11:59 +1100 (EST) Received: from localhost ([::1]:42179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJTUc-0006V3-VK for incoming@patchwork.ozlabs.org; Thu, 27 Oct 2011 13:11:50 -0400 Received: from eggs.gnu.org ([140.186.70.92]:54453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJTUX-0006Uu-Lx for qemu-devel@nongnu.org; Thu, 27 Oct 2011 13:11:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJTUW-0001n4-Br for qemu-devel@nongnu.org; Thu, 27 Oct 2011 13:11:45 -0400 Received: from mout.perfora.net ([74.208.4.195]:59090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJTUW-0001mx-7j for qemu-devel@nongnu.org; Thu, 27 Oct 2011 13:11:44 -0400 Received: from illuin.austin.ibm.com ([32.97.110.59]) by mrelay.perfora.net (node=mrus0) with ESMTP (Nemesis) id 0Mb6xv-1RZCkR0P3j-00KMLn; Thu, 27 Oct 2011 13:06:56 -0400 From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 27 Oct 2011 12:06:24 -0500 Message-Id: <1319735193-4718-2-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1319735193-4718-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1319735193-4718-1-git-send-email-mdroth@linux.vnet.ibm.com> X-Provags-ID: V02:K0:Hps8TVFDAPKgURa/RpJIMu4hhP+C31Xl2XgYIVlL1Q/ anokb6Z0pQf38fef1XHJjBU6hW66ay5ahzOxCQR8ZPhZvavATa w7JpesZKd2CruY7Qcq80+DpKoGEO/Hnyy4WDPUrxR8lcdacK3i K528wuvWa8attgL6F/oETmaNfzjDUMvwNl0BsCLI1fpi/Mp9U5 JAp0uD8abnH7AOOb7g4WLnUz89BoctsbN6f7IJg7gJ0Njjw24Z jOC9SvDhaBXyINoj8ziaN+JVxLQZ59/WvCipxzvv+jGxkApNBl rLJMbxECaHfmNmC3k3MZ5p5GHp+XdarSCJJoLCVg5Au8A+x9Tj MHEN+3mvDRg4c/ne9q7uxLCvAZXmYN1rgEaCnAKNuirz5E8C9p L7rBzrlxaemYbOvXhdg1aQZdK0Lzz80JFc= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.208.4.195 Cc: aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH v2 01/10] qapi: add Visitor interfaces for uint*_t and int*_t 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 --- qapi/qapi-visit-core.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ qapi/qapi-visit-core.h | 30 ++++++++++++++++++ 2 files changed, 108 insertions(+), 0 deletions(-) diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index ddef3ed..58f11fe 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -66,6 +66,28 @@ void visit_end_list(Visitor *v, Error **errp) } } +void visit_start_array(Visitor *v, void **obj, const char *name, size_t elem_count, + size_t elem_size, Error **errp) +{ + if (!error_is_set(errp)) { + v->start_array(v, obj, name, elem_count, elem_size, errp); + } +} + +void visit_next_array(Visitor *v, Error **errp) +{ + if (!error_is_set(errp)) { + v->next_array(v, errp); + } +} + +void visit_end_array(Visitor *v, Error **errp) +{ + if (!error_is_set(errp)) { + v->end_array(v, errp); + } +} + void visit_start_optional(Visitor *v, bool *present, const char *name, Error **errp) { @@ -96,6 +118,62 @@ void visit_type_int(Visitor *v, int64_t *obj, const char *name, Error **errp) } } +void visit_type_uint8(Visitor *v, uint8_t *obj, const char *name, Error **errp) +{ + if (!error_is_set(errp)) { + v->type_uint8(v, obj, name, errp); + } +} + +void visit_type_uint16(Visitor *v, uint16_t *obj, const char *name, Error **errp) +{ + if (!error_is_set(errp)) { + v->type_uint16(v, obj, name, errp); + } +} + +void visit_type_uint32(Visitor *v, uint32_t *obj, const char *name, Error **errp) +{ + if (!error_is_set(errp)) { + v->type_uint32(v, obj, name, errp); + } +} + +void visit_type_uint64(Visitor *v, uint64_t *obj, const char *name, Error **errp) +{ + if (!error_is_set(errp)) { + v->type_uint64(v, obj, name, errp); + } +} + +void visit_type_int8(Visitor *v, int8_t *obj, const char *name, Error **errp) +{ + if (!error_is_set(errp)) { + v->type_int8(v, obj, name, errp); + } +} + +void visit_type_int16(Visitor *v, int16_t *obj, const char *name, Error **errp) +{ + if (!error_is_set(errp)) { + v->type_int16(v, obj, name, errp); + } +} + +void visit_type_int32(Visitor *v, int32_t *obj, const char *name, Error **errp) +{ + if (!error_is_set(errp)) { + v->type_int32(v, obj, name, errp); + } +} + +void visit_type_int64(Visitor *v, int64_t *obj, const char *name, Error **errp) +{ + if (!error_is_set(errp)) { + v->type_int64(v, obj, name, errp); + } +} + void visit_type_bool(Visitor *v, bool *obj, const char *name, Error **errp) { if (!error_is_set(errp)) { diff --git a/qapi/qapi-visit-core.h b/qapi/qapi-visit-core.h index e850746..84f6c9e 100644 --- a/qapi/qapi-visit-core.h +++ b/qapi/qapi-visit-core.h @@ -22,6 +22,11 @@ typedef struct GenericList struct GenericList *next; } GenericList; +typedef struct GenericItem +{ + void *value; +} GenericItem; + typedef struct Visitor Visitor; struct Visitor @@ -35,10 +40,23 @@ struct Visitor GenericList *(*next_list)(Visitor *v, GenericList **list, Error **errp); void (*end_list)(Visitor *v, Error **errp); + void (*start_array)(Visitor *v, void **obj, const char *name, + size_t elem_count, size_t elem_size, Error **errp); + void (*next_array)(Visitor *v, Error **errp); + void (*end_array)(Visitor *v, Error **errp); + void (*type_enum)(Visitor *v, int *obj, const char *strings[], const char *kind, const char *name, Error **errp); void (*type_int)(Visitor *v, int64_t *obj, const char *name, Error **errp); + void (*type_uint8)(Visitor *v, uint8_t *obj, const char *name, Error **errp); + void (*type_uint16)(Visitor *v, uint16_t *obj, const char *name, Error **errp); + void (*type_uint32)(Visitor *v, uint32_t *obj, const char *name, Error **errp); + void (*type_uint64)(Visitor *v, uint64_t *obj, const char *name, Error **errp); + void (*type_int8)(Visitor *v, int8_t *obj, const char *name, Error **errp); + void (*type_int16)(Visitor *v, int16_t *obj, const char *name, Error **errp); + void (*type_int32)(Visitor *v, int32_t *obj, const char *name, Error **errp); + void (*type_int64)(Visitor *v, int64_t *obj, const char *name, Error **errp); void (*type_bool)(Visitor *v, bool *obj, const char *name, Error **errp); void (*type_str)(Visitor *v, char **obj, const char *name, Error **errp); void (*type_number)(Visitor *v, double *obj, const char *name, @@ -63,12 +81,24 @@ void visit_end_struct(Visitor *v, Error **errp); void visit_start_list(Visitor *v, const char *name, Error **errp); GenericList *visit_next_list(Visitor *v, GenericList **list, Error **errp); void visit_end_list(Visitor *v, Error **errp); +void visit_start_array(Visitor *v, void **obj, const char *name, size_t elem_count, + size_t elem_size, Error **errp); +void visit_next_array(Visitor *v, Error **errp); +void visit_end_array(Visitor *v, Error **errp); void visit_start_optional(Visitor *v, bool *present, const char *name, Error **errp); void visit_end_optional(Visitor *v, Error **errp); void visit_type_enum(Visitor *v, int *obj, const char *strings[], const char *kind, const char *name, Error **errp); void visit_type_int(Visitor *v, int64_t *obj, const char *name, Error **errp); +void visit_type_uint8(Visitor *v, uint8_t *obj, const char *name, Error **errp); +void visit_type_uint16(Visitor *v, uint16_t *obj, const char *name, Error **errp); +void visit_type_uint32(Visitor *v, uint32_t *obj, const char *name, Error **errp); +void visit_type_uint64(Visitor *v, uint64_t *obj, const char *name, Error **errp); +void visit_type_int8(Visitor *v, int8_t *obj, const char *name, Error **errp); +void visit_type_int16(Visitor *v, int16_t *obj, const char *name, Error **errp); +void visit_type_int32(Visitor *v, int32_t *obj, const char *name, Error **errp); +void visit_type_int64(Visitor *v, int64_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);