[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/32] qapi: make struct Visitor opaque
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 19/32] qapi: make struct Visitor opaque |
Date: |
Mon, 17 Dec 2012 19:17:21 +0100 |
Move its definition from qapi-visit-core.h to qapi-visit-impl.h.
Signed-off-by: Paolo Bonzini <address@hidden>
---
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[],
--
1.8.0.2
- [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines, (continued)
- [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 05/32] build: move rules from Makefile to */Makefile.objs, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 06/32] build: create ldscripts/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 08/32] build: kill libuser, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 07/32] build: kill libdis, move disassemblers to disas/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 09/32] janitor: do not rely on indirect inclusions of or from qemu-char.h, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 17/32] qapi: move inclusions of qemu-common.h from headers to .c files, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 16/32] ui: move files to ui/ and include/ui/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 18/32] qapi: remove qapi/qapi-types-core.h, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 15/32] qemu-ga: move qemu-ga files to qga/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 19/32] qapi: make struct Visitor opaque,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 14/32] net: reorganize headers, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 20/32] janitor: add guards to headers, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 22/32] block: move include files to include/block/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 21/32] qapi: move include files to include/qobject/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 24/32] monitor: move include files to include/monitor/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 31/32] hw: move executable format header files to hw/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 28/32] softmmu: move include files to include/sysemu/, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 30/32] fpu: move public header file to include/fpu, Paolo Bonzini, 2012/12/17
- [Qemu-devel] [PATCH 23/32] exec: move include files to include/exec/, Paolo Bonzini, 2012/12/17