From patchwork Mon Dec 17 18:17:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 206990 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 C81692C008E for ; Tue, 18 Dec 2012 06:54:01 +1100 (EST) Received: from localhost ([::1]:57157 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkfHo-0006f0-Vl for incoming@patchwork.ozlabs.org; Mon, 17 Dec 2012 13:19:32 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkfGm-0004wN-JR for qemu-devel@nongnu.org; Mon, 17 Dec 2012 13:18:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkfGj-0004uu-CW for qemu-devel@nongnu.org; Mon, 17 Dec 2012 13:18:28 -0500 Received: from mail-we0-f173.google.com ([74.125.82.173]:45077) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkfGj-0004uN-2w for qemu-devel@nongnu.org; Mon, 17 Dec 2012 13:18:25 -0500 Received: by mail-we0-f173.google.com with SMTP id z2so3005844wey.4 for ; Mon, 17 Dec 2012 10:18:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=x0WdyNFYUtDs0xyT8Aa6VqSMyOMLXFzfwlV7mw3lyPw=; b=H8f0Zsd8d1r+RhwScaN0I5HbfqdKClxltocWC7Y3RYvdm8sqAashiQS2WlaO34qdlA CYF3ueE5BhqbBkZnukvvP2fu5B5DscSZoMndk5y5yLvUlks6kkoZNa6lQym+lVmdBdmC /PVst3z+Xg/DNwe5qPeBt/8oC9hb7QfwZWkIk+/ElV8Rw+SFeBWTHWSCI9TtDHP9CBZX 4JQqRpH5+zFMSizOoC940zR8vSa49GpmjMeiV1qxwYT4JWabJHZyfNQx91I8gTcABtSV P2RCfzZELXgj0BHgfiJi54ZF5wHYux0UoqyW0f8MTCtR6Ai6mT6FwUG7dz+WwNzCCBER Hx7A== Received: by 10.194.58.175 with SMTP id s15mr18812680wjq.31.1355768304302; Mon, 17 Dec 2012 10:18:24 -0800 (PST) Received: from yakj.lan (93-34-219-150.ip51.fastwebnet.it. [93.34.219.150]) by mx.google.com with ESMTPS id bz12sm13692375wib.5.2012.12.17.10.18.22 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2012 10:18:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 17 Dec 2012 19:17:21 +0100 Message-Id: <1355768254-12933-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.2 In-Reply-To: <1355768254-12933-1-git-send-email-pbonzini@redhat.com> References: <1355768254-12933-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.125.82.173 Subject: [Qemu-devel] [PATCH 19/32] qapi: make struct Visitor opaque 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 Move its definition from qapi-visit-core.h to qapi-visit-impl.h. Signed-off-by: Paolo Bonzini --- qapi/qapi-visit-core.h | 40 ---------------------------------------- qapi/qapi-visit-impl.h | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qapi/qapi-visit-core.h b/qapi/qapi-visit-core.h index 00ce678..602debe 100644 --- a/qapi/qapi-visit-core.h +++ b/qapi/qapi-visit-core.h @@ -24,46 +24,6 @@ typedef struct GenericList typedef struct Visitor Visitor; -struct Visitor -{ - /* Must be set */ - void (*start_struct)(Visitor *v, void **obj, const char *kind, - const char *name, size_t size, Error **errp); - void (*end_struct)(Visitor *v, Error **errp); - - void (*start_list)(Visitor *v, const char *name, Error **errp); - GenericList *(*next_list)(Visitor *v, GenericList **list, Error **errp); - void (*end_list)(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_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, - Error **errp); - - /* May be NULL */ - void (*start_optional)(Visitor *v, bool *present, const char *name, - Error **errp); - void (*end_optional)(Visitor *v, Error **errp); - - void (*start_handle)(Visitor *v, void **obj, const char *kind, - const char *name, Error **errp); - void (*end_handle)(Visitor *v, 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); - /* visit_type_size() falls back to (*type_uint64)() if type_size is unset */ - void (*type_size)(Visitor *v, uint64_t *obj, const char *name, Error **errp); -}; - void visit_start_handle(Visitor *v, void **obj, const char *kind, const char *name, Error **errp); void visit_end_handle(Visitor *v, Error **errp); diff --git a/qapi/qapi-visit-impl.h b/qapi/qapi-visit-impl.h index efd4271..9337d62 100644 --- a/qapi/qapi-visit-impl.h +++ b/qapi/qapi-visit-impl.h @@ -15,6 +15,46 @@ #include "error.h" #include "qapi/qapi-visit-core.h" +struct Visitor +{ + /* Must be set */ + void (*start_struct)(Visitor *v, void **obj, const char *kind, + const char *name, size_t size, Error **errp); + void (*end_struct)(Visitor *v, Error **errp); + + void (*start_list)(Visitor *v, const char *name, Error **errp); + GenericList *(*next_list)(Visitor *v, GenericList **list, Error **errp); + void (*end_list)(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_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, + Error **errp); + + /* May be NULL */ + void (*start_optional)(Visitor *v, bool *present, const char *name, + Error **errp); + void (*end_optional)(Visitor *v, Error **errp); + + void (*start_handle)(Visitor *v, void **obj, const char *kind, + const char *name, Error **errp); + void (*end_handle)(Visitor *v, 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); + /* visit_type_size() falls back to (*type_uint64)() if type_size is unset */ + void (*type_size)(Visitor *v, uint64_t *obj, const char *name, Error **errp); +}; + void input_type_enum(Visitor *v, int *obj, const char *strings[], const char *kind, const char *name, Error **errp); void output_type_enum(Visitor *v, int *obj, const char *strings[],