[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/20] qapi: QmpInputVisitor, implement array handli
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 10/20] qapi: QmpInputVisitor, implement array handling |
Date: |
Tue, 14 Aug 2012 11:27:16 -0500 |
Signed-off-by: Michael Roth <address@hidden>
---
qapi/qmp-input-visitor.c | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index 107d8d3..c4388f3 100644
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -132,7 +132,7 @@ static void qmp_input_start_struct(Visitor *v, void **obj,
const char *kind,
return;
}
- if (obj) {
+ if (obj && *obj == NULL) {
*obj = g_malloc0(size);
}
}
@@ -274,6 +274,33 @@ static void qmp_input_start_optional(Visitor *v, bool
*present,
*present = true;
}
+static void qmp_input_start_carray(Visitor *v, void **obj, const char *name,
+ size_t elem_count, size_t elem_size,
+ Error **errp)
+{
+ if (obj && *obj == NULL) {
+ *obj = g_malloc0(elem_count * elem_size);
+ }
+ qmp_input_start_list(v, name, errp);
+}
+
+static void qmp_input_next_carray(Visitor *v, Error **errp)
+{
+ QmpInputVisitor *qiv = to_qiv(v);
+ StackObject *so = &qiv->stack[qiv->nb_stack - 1];
+
+ if (so->entry == NULL) {
+ so->entry = qlist_first(qobject_to_qlist(so->obj));
+ } else {
+ so->entry = qlist_next(so->entry);
+ }
+}
+
+static void qmp_input_end_carray(Visitor *v, Error **errp)
+{
+ qmp_input_end_list(v, errp);
+}
+
Visitor *qmp_input_get_visitor(QmpInputVisitor *v)
{
return &v->visitor;
@@ -302,6 +329,9 @@ QmpInputVisitor *qmp_input_visitor_new(QObject *obj)
v->visitor.type_str = qmp_input_type_str;
v->visitor.type_number = qmp_input_type_number;
v->visitor.start_optional = qmp_input_start_optional;
+ v->visitor.start_carray = qmp_input_start_carray;
+ v->visitor.next_carray = qmp_input_next_carray;
+ v->visitor.end_carray = qmp_input_end_carray;
qmp_input_push(v, obj, NULL);
qobject_incref(obj);
--
1.7.9.5
- [Qemu-devel] [PATCH 01/20] qapi: qapi-visit.py -> qapi_visit.py so we can import, (continued)
- [Qemu-devel] [PATCH 01/20] qapi: qapi-visit.py -> qapi_visit.py so we can import, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 02/20] qapi: qapi-types.py -> qapi_types.py, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 03/20] qapi: qapi-commands.py -> qapi_commands.py, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 04/20] qapi: qapi_visit.py, make code useable as module, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 06/20] qapi: add visitor interfaces for C arrays, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 05/20] qapi: qapi_visit.py, support arrays and complex qapi definitions, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 07/20] qapi: qapi_visit.py, support generating static functions, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 08/20] qapi: qapi_visit.py, support for visiting non-pointer/embedded structs, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 09/20] qapi: QmpOutputVisitor, implement array handling, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 11/20] qapi: qapi.py, make json parser more robust, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 10/20] qapi: QmpInputVisitor, implement array handling,
Michael Roth <=
- [Qemu-devel] [PATCH 12/20] qapi: add open-coded visitor for struct tm types, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 13/20] qom-fuse: workaround for truncated properties > 4096, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 15/20] qdev: move Property-related declarations to qdev-properties.h, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 14/20] module additions for schema registration, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 17/20] qidl: parser, initial import from qc.git, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 19/20] qidl: qidl.h, definitions for qidl annotations, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 18/20] qidl: codegen, initial commit, Michael Roth, 2012/08/14
- [Qemu-devel] [PATCH 16/20] qidl: Add documentation, Michael Roth, 2012/08/14