diff options
| -rw-r--r-- | block/qapi.c | 2 | ||||
| -rw-r--r-- | blockdev.c | 2 | ||||
| -rw-r--r-- | include/qapi/qmp-output-visitor.h | 1 | ||||
| -rw-r--r-- | qapi/qmp-output-visitor.c | 14 | ||||
| -rw-r--r-- | qemu-img.c | 6 | ||||
| -rw-r--r-- | qom/qom-qobject.c | 2 | ||||
| -rw-r--r-- | replay/replay-input.c | 2 | ||||
| -rw-r--r-- | tests/check-qnull.c | 2 | ||||
| -rw-r--r-- | tests/test-qmp-output-visitor.c | 2 | ||||
| -rw-r--r-- | util/qemu-sockets.c | 2 |
10 files changed, 14 insertions, 21 deletions
diff --git a/block/qapi.c b/block/qapi.c index 5594f74d17..41fe4f9fc2 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -699,7 +699,7 @@ void bdrv_image_info_specific_dump(fprintf_function func_fprintf, void *f, assert(qobject_type(obj) == QTYPE_QDICT); data = qdict_get(qobject_to_qdict(obj), "data"); dump_qobject(func_fprintf, f, 1, data); - qmp_output_visitor_cleanup(ov); + visit_free(qmp_output_get_visitor(ov)); } void bdrv_image_info_dump(fprintf_function func_fprintf, void *f, diff --git a/blockdev.c b/blockdev.c index 3a104a0aaa..c05aaa6ea6 100644 --- a/blockdev.c +++ b/blockdev.c @@ -4020,7 +4020,7 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp) } fail: - qmp_output_visitor_cleanup(ov); + visit_free(qmp_output_get_visitor(ov)); } void qmp_x_blockdev_del(bool has_id, const char *id, diff --git a/include/qapi/qmp-output-visitor.h b/include/qapi/qmp-output-visitor.h index 22667706ab..29c9a2e3cd 100644 --- a/include/qapi/qmp-output-visitor.h +++ b/include/qapi/qmp-output-visitor.h @@ -20,7 +20,6 @@ typedef struct QmpOutputVisitor QmpOutputVisitor; QmpOutputVisitor *qmp_output_visitor_new(void); -void qmp_output_visitor_cleanup(QmpOutputVisitor *v); QObject *qmp_output_get_qobject(QmpOutputVisitor *v); Visitor *qmp_output_get_visitor(QmpOutputVisitor *v); diff --git a/qapi/qmp-output-visitor.c b/qapi/qmp-output-visitor.c index 5f0035cbf6..3d12623cf9 100644 --- a/qapi/qmp-output-visitor.c +++ b/qapi/qmp-output-visitor.c @@ -217,21 +217,15 @@ Visitor *qmp_output_get_visitor(QmpOutputVisitor *v) static void qmp_output_free(Visitor *v) { QmpOutputVisitor *qov = to_qov(v); - - qmp_output_visitor_cleanup(qov); -} - -void qmp_output_visitor_cleanup(QmpOutputVisitor *v) -{ QStackEntry *e, *tmp; - QTAILQ_FOREACH_SAFE(e, &v->stack, node, tmp) { - QTAILQ_REMOVE(&v->stack, e, node); + QTAILQ_FOREACH_SAFE(e, &qov->stack, node, tmp) { + QTAILQ_REMOVE(&qov->stack, e, node); g_free(e); } - qobject_decref(v->root); - g_free(v); + qobject_decref(qov->root); + g_free(qov); } QmpOutputVisitor *qmp_output_visitor_new(void) diff --git a/qemu-img.c b/qemu-img.c index debd7f1383..728f471801 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -500,7 +500,7 @@ static void dump_json_image_check(ImageCheck *check, bool quiet) assert(str != NULL); qprintf(quiet, "%s\n", qstring_get_str(str)); qobject_decref(obj); - qmp_output_visitor_cleanup(ov); + visit_free(qmp_output_get_visitor(ov)); QDECREF(str); } @@ -2190,7 +2190,7 @@ static void dump_json_image_info_list(ImageInfoList *list) assert(str != NULL); printf("%s\n", qstring_get_str(str)); qobject_decref(obj); - qmp_output_visitor_cleanup(ov); + visit_free(qmp_output_get_visitor(ov)); QDECREF(str); } @@ -2206,7 +2206,7 @@ static void dump_json_image_info(ImageInfo *info) assert(str != NULL); printf("%s\n", qstring_get_str(str)); qobject_decref(obj); - qmp_output_visitor_cleanup(ov); + visit_free(qmp_output_get_visitor(ov)); QDECREF(str); } diff --git a/qom/qom-qobject.c b/qom/qom-qobject.c index c3c9188d00..6714565f13 100644 --- a/qom/qom-qobject.c +++ b/qom/qom-qobject.c @@ -41,6 +41,6 @@ QObject *object_property_get_qobject(Object *obj, const char *name, ret = qmp_output_get_qobject(qov); } error_propagate(errp, local_err); - qmp_output_visitor_cleanup(qov); + visit_free(qmp_output_get_visitor(qov)); return ret; } diff --git a/replay/replay-input.c b/replay/replay-input.c index 7b6fa93b8d..9cbb4c19e9 100644 --- a/replay/replay-input.c +++ b/replay/replay-input.c @@ -31,7 +31,7 @@ static InputEvent *qapi_clone_InputEvent(InputEvent *src) ov = qmp_output_get_visitor(qov); visit_type_InputEvent(ov, NULL, &src, &error_abort); obj = qmp_output_get_qobject(qov); - qmp_output_visitor_cleanup(qov); + visit_free(ov); if (!obj) { return NULL; } diff --git a/tests/check-qnull.c b/tests/check-qnull.c index d0412e4169..6310bf7d41 100644 --- a/tests/check-qnull.c +++ b/tests/check-qnull.c @@ -58,7 +58,7 @@ static void qnull_visit_test(void) obj = qmp_output_get_qobject(qov); g_assert(obj == &qnull_); qobject_decref(obj); - qmp_output_visitor_cleanup(qov); + visit_free(qmp_output_get_visitor(qov)); g_assert(qnull_.refcnt == 1); } diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c index 75c8e1b3e0..45d87fb160 100644 --- a/tests/test-qmp-output-visitor.c +++ b/tests/test-qmp-output-visitor.c @@ -38,7 +38,7 @@ static void visitor_output_setup(TestOutputVisitorData *data, static void visitor_output_teardown(TestOutputVisitorData *data, const void *unused) { - qmp_output_visitor_cleanup(data->qov); + visit_free(data->ov); data->qov = NULL; data->ov = NULL; } diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 3677cd21dc..01fc15481a 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -1157,7 +1157,7 @@ void qapi_copy_SocketAddress(SocketAddress **p_dest, ov = qmp_output_get_visitor(qov); visit_type_SocketAddress(ov, NULL, &src, &error_abort); obj = qmp_output_get_qobject(qov); - qmp_output_visitor_cleanup(qov); + visit_free(ov); if (!obj) { return; } |