Signed-off-by: Michael Roth <mdr...@linux.vnet.ibm.com>
---
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);
--
1.7.4.1
