[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/15] qapi: Fix Visitor contract for start_alternate()
From: |
Markus Armbruster |
Subject: |
[PATCH v2 07/15] qapi: Fix Visitor contract for start_alternate() |
Date: |
Fri, 24 Apr 2020 10:43:30 +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>
---
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
- Re: [PATCH v2 06/15] qapi: Assert incomplete object occurs only in dealloc visitor, (continued)
- [PATCH v2 09/15] qapi: Assert non-input visitors see only valid narrow integers, Markus Armbruster, 2020/04/24
- [PATCH v2 14/15] qapi: Disallow qmp_marshal_FOO(NULL, ...), Markus Armbruster, 2020/04/24
- [PATCH v2 10/15] qapi: Clean up visitor's recovery from input with invalid type, Markus Armbruster, 2020/04/24
- [PATCH v2 15/15] qapi: Generate simpler marshalling code when no arguments, Markus Armbruster, 2020/04/24
- [PATCH v2 08/15] qapi: Assert output visitors see only valid enum values, Markus Armbruster, 2020/04/24
- [PATCH v2 12/15] qapi: Only input visitors can actually fail, Markus Armbruster, 2020/04/24
- [PATCH v2 07/15] qapi: Fix Visitor contract for start_alternate(),
Markus Armbruster <=
- [PATCH v2 05/15] qapi: Polish prose in visitor.h, Markus Armbruster, 2020/04/24
- Re: [PATCH v2 00/15] qapi: Spring cleaning, no-reply, 2020/04/24
- Re: [PATCH v2 00/15] qapi: Spring cleaning, Markus Armbruster, 2020/04/29