[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/20] qapi: Fix Visitor contract for start_alternate()
From: |
Markus Armbruster |
Subject: |
[PULL 12/20] qapi: Fix Visitor contract for start_alternate() |
Date: |
Thu, 30 Apr 2020 07:30:56 +0200 |
The contract demands v->start_alternate() for input and dealloc
visitors, but visit_start_alternate() actually requires it for input
and clone visitors. Fix the contract, and delete superfluous
qapi_dealloc_start_alternate().
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
include/qapi/visitor-impl.h | 5 ++---
qapi/qapi-dealloc-visitor.c | 7 -------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/include/qapi/visitor-impl.h b/include/qapi/visitor-impl.h
index 8ccb3b6c20..252206dc0d 100644
--- a/include/qapi/visitor-impl.h
+++ b/include/qapi/visitor-impl.h
@@ -67,13 +67,12 @@ struct Visitor
/* Must be set */
void (*end_list)(Visitor *v, void **list);
- /* Must be set by input and dealloc visitors to visit alternates;
- * optional for output visitors. */
+ /* Must be set by input and clone visitors to visit alternates */
void (*start_alternate)(Visitor *v, const char *name,
GenericAlternate **obj, size_t size,
Error **errp);
- /* Optional, needed for dealloc visitor */
+ /* Optional */
void (*end_alternate)(Visitor *v, void **obj);
/* Must be set */
diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c
index d192724b13..2239fc6417 100644
--- a/qapi/qapi-dealloc-visitor.c
+++ b/qapi/qapi-dealloc-visitor.c
@@ -34,12 +34,6 @@ static void qapi_dealloc_end_struct(Visitor *v, void **obj)
}
}
-static void qapi_dealloc_start_alternate(Visitor *v, const char *name,
- GenericAlternate **obj, size_t size,
- Error **errp)
-{
-}
-
static void qapi_dealloc_end_alternate(Visitor *v, void **obj)
{
if (obj) {
@@ -123,7 +117,6 @@ Visitor *qapi_dealloc_visitor_new(void)
v->visitor.type = VISITOR_DEALLOC;
v->visitor.start_struct = qapi_dealloc_start_struct;
v->visitor.end_struct = qapi_dealloc_end_struct;
- v->visitor.start_alternate = qapi_dealloc_start_alternate;
v->visitor.end_alternate = qapi_dealloc_end_alternate;
v->visitor.start_list = qapi_dealloc_start_list;
v->visitor.next_list = qapi_dealloc_next_list;
--
2.21.1
- [PULL 00/20] QAPI patches for 2020-04-30, Markus Armbruster, 2020/04/30
- [PULL 01/20] qobject: Clean up QLIST_FOREACH_ENTRY(), Markus Armbruster, 2020/04/30
- [PULL 03/20] qobject: Eliminate qlist_iter(), use QLIST_FOREACH_ENTRY() instead, Markus Armbruster, 2020/04/30
- [PULL 02/20] qobject: Factor out helper json_pretty_newline(), Markus Armbruster, 2020/04/30
- [PULL 08/20] qapi: Fix typo in visit_start_list()'s contract, Markus Armbruster, 2020/04/30
- [PULL 09/20] qapi: Document @errp usage more thoroughly in visitor.h, Markus Armbruster, 2020/04/30
- [PULL 12/20] qapi: Fix Visitor contract for start_alternate(),
Markus Armbruster <=
- [PULL 11/20] qapi: Assert incomplete object occurs only in dealloc visitor, Markus Armbruster, 2020/04/30
- [PULL 10/20] qapi: Polish prose in visitor.h, Markus Armbruster, 2020/04/30
- [PULL 14/20] qapi: Assert non-input visitors see only valid narrow integers, Markus Armbruster, 2020/04/30
- [PULL 20/20] qapi: Generate simpler marshalling code when no arguments, Markus Armbruster, 2020/04/30
- [PULL 04/20] qobject: Eliminate qdict_iter(), use qdict_first(), qdict_next(), Markus Armbruster, 2020/04/30
- [PULL 05/20] qemu-option: Clean up after the previous commit, Markus Armbruster, 2020/04/30
- [PULL 06/20] qapi: Belatedly update visitor.h's big comment for QAPI modules, Markus Armbruster, 2020/04/30
- [PULL 13/20] qapi: Assert output visitors see only valid enum values, Markus Armbruster, 2020/04/30
- [PULL 18/20] qom: Simplify object_property_get_enum(), Markus Armbruster, 2020/04/30
- [PULL 16/20] qapi: Assert non-input visitors see only valid alternate tags, Markus Armbruster, 2020/04/30