qapi: Spring cleaning
PATCH 10/13 qapi: Clean up visitor's recovery from input with invalid type
In reply to Markus ArmbrusterAn alternate type's visit_type_FOO() fails when it runs into an invalid ->type. If it's an input visit, we then need to free the the object we got from visit_start_alternate(). We do that with qapi_free_FOO(), which uses the dealloc visitor.
Trouble is that object is in a bad state: its ->type is invalid. So the dealloc visitor will run into the same error again, and the error recovery skips deallocating the alternate's (invalid) alternative. This is a roundabout way to g_free() the alternate.
Simplify: replace the qapi_free_FOO() by g_free().
--- scripts/qapi/visit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/qapi/visit.py +1 -1
@@ -238,7 +238,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error out_obj: visit_end_alternate(v, (void **)obj); if (err && visit_is_input(v)) { - qapi_free_%(c_name)s(*obj); + g_free(*obj); *obj = NULL; } out:
Signature · 1 line
2.21.1
cover qapi: Spring cleaning
Markus Armbruster (13):
qapi: Belatedly update visitor.h's big comment for QAPI modules
qapi: Fix the virtual walk example in visitor.h's big comment
qapi: Fix typo in visit_start_list()'s contract
qapi: Document @errp usage more thoroughly in visitor.h
qapi: Polish prose in visitor.h
qapi: Assert incomplete object occurs only in dealloc visitor
qapi: Fix Visitor contract for start_alternate()
qapi: Assert output visitors see only valid enum values
qapi: Assert non-input visitors seeg only valid narrow integers
qapi: Clean up visitor's recovery from input with invalid type
qapi: Assert non-input visitors see only valid alternate tags
qapi: Only input visitors can actually fail
qom: Simplify object_property_get_enum()
include/qapi/visitor-impl.h | 9 +- include/qapi/visitor.h | 192 ++++++++++++++++------------ block.c | 9 +- block/sheepdog.c | 9 +- blockdev.c | 16 +-- hw/core/machine-hmp-cmds.c | 2 +- monitor/hmp-cmds.c | 3 +- qapi/qapi-dealloc-visitor.c | 7 - qapi/qapi-visit-core.c | 20 +-- qom/object.c | 4 +- tests/test-qobject-output-visitor.c | 39 ------ tests/test-string-output-visitor.c | 19 --- scripts/qapi/visit.py | 7 +- 13 files changed, 141 insertions(+), 195 deletions(-)
Signature · 1 line
2.21.1
PATCH 8/13 qapi: Assert output visitors see only valid enum values
output_type_enum() fails when *obj is not a valid value of the enum type. Should not happen. Drop the check, along with its unit tests. qapi_enum_lookup()'s assertion still guards.
--- qapi/qapi-visit-core.c | 9 ------- tests/test-qobject-output-visitor.c | 39 ----------------------------- tests/test-string-output-visitor.c | 19 -------------- 3 files changed, 67 deletions(-)
qapi/qapi-visit-core.c +0 -9
@@ -341,15 +341,6 @@ static void output_type_enum(Visitor *v, const char *name, int *obj,int value = *obj;char *enum_str; -/* -* TODO why is this an error, not an assertion? If assertion: -* delete, and rely on qapi_enum_lookup() -*/ -if (value <0 || value >= lookup->size) { -error_setg (errp,QERR_INVALID_PARAMETER , name ? name :"null" ); -return ; - } - enum_str = (char *)qapi_enum_lookup (lookup, value);visit_type_str (v, name, &enum_str, errp); }
tests/test-qobject-output-visitor.c +0 -39
@@ -141,21 +141,6 @@ static void test_visitor_out_enum(TestOutputVisitorData *data, } } -static void test_visitor_out_enum_errors (TestOutputVisitorData *data, -const void *unused) -{ -EnumOne i, bad_values[] = {ENUM_ONE__MAX ,-1 }; - -for (i =0 ; i <ARRAY_SIZE (bad_values) ; i++) { -Error *err =NULL ; - -visit_type_EnumOne (data->ov,"unused" , &bad_values[i], &err); -error_free_or_abort (&err); -visitor_reset (data); - } -} - -static void test_visitor_out_struct (TestOutputVisitorData *data,const void *unused) {
@@ -234,26 +219,6 @@ static void test_visitor_out_struct_nested(TestOutputVisitorData *data,qapi_free_UserDefTwo (ud2); } -static void test_visitor_out_struct_errors (TestOutputVisitorData *data, -const void *unused) -{ -EnumOne bad_values[] = {ENUM_ONE__MAX ,-1 }; -UserDefOne u = {0 }; -UserDefOne *pu = &u; -int i; - -for (i =0 ; i <ARRAY_SIZE (bad_values) ; i++) { -Error *err =NULL ; - - u.has_enum1 = true; - u.enum1 = bad_values[i]; -visit_type_UserDefOne (data->ov,"unused" , &pu, &err); -error_free_or_abort (&err); -visitor_reset (data); - } -} - -static void test_visitor_out_list (TestOutputVisitorData *data,const void *unused) {
@@ -821,14 +786,10 @@ int main(int argc, char **argv) &out_visitor_data, test_visitor_out_no_string);output_visitor_test_add ("/visitor/output/enum" , &out_visitor_data, test_visitor_out_enum); -output_visitor_test_add ("/visitor/output/enum-errors" , - &out_visitor_data, test_visitor_out_enum_errors);output_visitor_test_add ("/visitor/output/struct" , &out_visitor_data, test_visitor_out_struct);output_visitor_test_add ("/visitor/output/struct-nested" , &out_visitor_data, test_visitor_out_struct_nested); -output_visitor_test_add ("/visitor/output/struct-errors" , - &out_visitor_data, test_visitor_out_struct_errors);output_visitor_test_add ("/visitor/output/list" , &out_visitor_data, test_visitor_out_list); output_visitor_test_add("/visitor/output/any",
tests/test-string-output-visitor.c +0 -19
@@ -203,19 +203,6 @@ static void test_visitor_out_enum(TestOutputVisitorData *data, } } -static void test_visitor_out_enum_errors (TestOutputVisitorData *data, -const void *unused) -{ -EnumOne i, bad_values[] = {ENUM_ONE__MAX ,-1 }; - -for (i =0 ; i <ARRAY_SIZE (bad_values) ; i++) { -Error *err =NULL ; - -visit_type_EnumOne (data->ov,"unused" , &bad_values[i], &err); -error_free_or_abort (&err); - } -} - static void output_visitor_test_add(const char *testpath, TestOutputVisitorData *data,
@@ -260,12 +247,6 @@ int main(int argc, char **argv) &out_visitor_data, test_visitor_out_enum, false);output_visitor_test_add ("/string-visitor/output/enum-human" , &out_visitor_data, test_visitor_out_enum, true); -output_visitor_test_add ("/string-visitor/output/enum-errors" , - &out_visitor_data, test_visitor_out_enum_errors, - false); -output_visitor_test_add ("/string-visitor/output/enum-errors-human" , - &out_visitor_data, test_visitor_out_enum_errors, - true);output_visitor_test_add ("/string-visitor/output/intList" , &out_visitor_data, test_visitor_out_intList, false); output_visitor_test_add("/string-visitor/output/intList-human",
Signature · 1 line
2.21.1
PATCH 11/13 qapi: Assert non-input visitors see only valid alternate tags
In reply to Markus ArmbrusterAn alternate type's visit_type_FOO() fails when it runs into an invalid ->type.
This is appropriate with an input visitor: visit_start_alternate() sets ->type according to the input, and bad input can lead to bad ->type.
It should never happen with an output, clone or dealloc visitor: if it did, the alternate being output, cloned or deallocated would be messed up beyond repair. Assert that.
--- scripts/qapi/visit.py | 1 + 1 file changed, 1 insertion(+)
scripts/qapi/visit.py +1 -0
@@ -232,6 +232,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error case QTYPE_NONE: abort(); default: + assert(visit_is_input(v)); error_setg(&err, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", "%(name)s"); }
Signature · 1 line
2.21.1
PATCH 6/13 qapi: Assert incomplete object occurs only in dealloc visitor
In reply to Markus Armbruster--- include/qapi/visitor.h | 5 +++++ qapi/qapi-visit-core.c | 5 +++++ scripts/qapi/visit.py | 4 ++++ 3 files changed, 14 insertions(+)
include/qapi/visitor.h +5 -0
@@ -479,6 +479,11 @@ void visit_type_enum(Visitor *v, const char *name, int *obj,*/ bool visit_is_input (Visitor *v); +/* +* Check if visitor is a dealloc visitor. +*/ +bool visit_is_dealloc (Visitor *v); +/*** Visiting built-in types ***/ /*
qapi/qapi-visit-core.c +5 -0
@@ -142,6 +142,11 @@ bool visit_is_input(Visitor *v)return v->type ==VISITOR_INPUT ; } +bool visit_is_dealloc (Visitor *v) +{ +return v->type ==VISITOR_DEALLOC ; +} +void visit_type_int (Visitor *v,const char *name,int64_t *obj,Error **errp) {assert (obj);
scripts/qapi/visit.py +4 -0
@@ -189,6 +189,8 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error goto out; } if (!*obj) { + /* incomplete */ + assert(visit_is_dealloc(v)); goto out_obj; } switch ((*obj)->type) {
@@ -260,6 +262,8 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error goto out; } if (!*obj) { + /* incomplete */ + assert(visit_is_dealloc(v)); goto out_obj; } visit_type_%(c_name)s_members(v, *obj, &err);
Signature · 1 line
2.21.1
PATCH 1/13 qapi: Belatedly update visitor.h's big comment for QAPI modules
In reply to Markus Armbruster--- include/qapi/visitor.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
include/qapi/visitor.h +5 -5
@@ -58,7 +58,7 @@* * where T is FOO for scalar types, and FOO * otherwise. The scalar * visitors are declared here; the remaining visitors are generated in -* qapi-visit.h. +* qapi-visit-MODULE.h. * * The @name parameter of visit_type_FOO() describes the relation * between this QAPI value and its parent container. When visiting
@@ -86,16 +86,16 @@* by manual construction. * * For the QAPI object types (structs, unions, and alternates), there -* is an additional generated function in qapi-visit.h compatible -* with: +* is an additional generated function in qapi-visit-MODULE.h +* compatible with: * * void visit_type_FOO_members(Visitor *v, FOO *obj, Error **errp); * * for visiting the members of a type without also allocating the QAPI * struct. * -* Additionally, in qapi-types.h, all QAPI pointer types (structs, -* unions, alternates, and lists) have a generated function compatible +* Additionally, QAPI pointer types (structs, unions, alternates, and +* lists) have a generated function in qapi-types-MODULE.h compatible * with: * * void qapi_free_FOO(FOO *obj);
Signature · 1 line
2.21.1
PATCH 12/13 qapi: Only input visitors can actually fail
In reply to Markus ArmbrusterThe previous few commits have made this more obvious, and removed the one exception. Time to clarify the documentation, and drop dead error checking.
--- include/qapi/visitor-impl.h | 4 ++++ include/qapi/visitor.h | 40 ++++++++++++++++++++++--------------- block.c | 9 +-------- block/sheepdog.c | 9 +-------- blockdev.c | 16 ++------------- hw/core/machine-hmp-cmds.c | 2 +- monitor/hmp-cmds.c | 3 ++- 7 files changed, 35 insertions(+), 48 deletions(-)
include/qapi/visitor-impl.h +4 -0
@@ -43,6 +43,10 @@ typedef enum VisitorType {struct Visitor { +/* +* Only input visitors may fail! +*/ +/* Must be set to visit structs */ void (*start_struct)(Visitor *v,const char *name,void **obj,size_t size,Error **errp);
include/qapi/visitor.h +24 -16
@@ -82,7 +82,7 @@* Each function also takes the customary @errp argument (see * qapi/error.h for details), for reporting any errors (such as if a * member @name is not present, or is present but not the specified -* type). +* type). Only input visitors can fail. * * If an error is detected during visit_type_FOO() with an input * visitor, then *@obj will be set to NULL for pointer types, and left
@@ -164,19 +164,14 @@* * <example> * Foo *f = ...obtain populated object... -* Error *err = NULL; * Visitor *v; * Type *result; * * v = FOO_visitor_new(..., &result); -* visit_type_Foo(v, NULL, &f, &err); -* if (err) { -* ...handle error... -* } else { -* visit_complete(v, &result); -* ...use result... -* } +* visit_type_Foo(v, NULL, &f, &error_abort); +* visit_complete(v, &result); * visit_free(v); +* ...use result... * </example> * * It is also possible to use the visitors to do a virtual walk, where
@@ -289,6 +284,7 @@ void visit_free(Visitor *v);* case @size is ignored. * * On failure, set *@obj to NULL and store an error through @errp. +* Can happen only when @v is an input visitor. * * After visit_start_struct() succeeds, the caller may visit its * members one after the other, passing the member's name and address
@@ -305,7 +301,8 @@ void visit_start_struct(Visitor *v, const char *name, void **obj,/* * Prepare for completing an object visit. * -* On failure, store an error through @errp. +* On failure, store an error through @errp. Can happen only when @v +* is an input visitor. * * Should be called prior to visit_end_struct() if all other * intermediate visit steps were successful, to allow the visitor one
@@ -342,6 +339,7 @@ void visit_end_struct(Visitor *v, void **obj);* ignored. * * On failure, set *@list to NULL and store an error through @errp. +* Can happen only when @v is an input visitor. * * After visit_start_list() succeeds, the caller may visit its members * one after the other. A real visit (where @list is non-NULL) uses
@@ -375,7 +373,8 @@ GenericList *visit_next_list(Visitor *v, GenericList *tail, size_t size);/* * Prepare for completing a list visit. * -* On failure, store an error through @errp. +* On failure, store an error through @errp. Can happen only when @v +* is an input visitor. * * Should be called prior to visit_end_list() if all other * intermediate visit steps were successful, to allow the visitor one
@@ -411,6 +410,7 @@ void visit_end_list(Visitor *v, void **list);* (*@obj)->type. Other visitors leave @obj unchanged. * * On failure, set *@obj to NULL and store an error through @errp. +* Can happen only when @v is an input visitor. * * If successful, this must be paired with visit_end_alternate() with * the same @obj to clean up, even if visiting the contents of the
@@ -465,11 +465,13 @@ bool visit_optional(Visitor *v, const char *name, bool *present);* visitors produce text output. The mapping between enumeration * values and strings is done by the visitor core, using @lookup. * -* On failure, store an error through @errp. +* On failure, store an error through @errp. Can happen only when @v +* is an input visitor. * * May call visit_type_str() under the hood, and the enum visit may * fail even if the corresponding string visit succeeded; this implies -* that visit_type_str() must have no unwelcome side effects. +* that an input visitor's visit_type_str() must have no unwelcome +* side effects. */ void visit_type_enum (Visitor *v,const char *name,int *obj,const QEnumLookup *lookup,Error **errp);
@@ -495,7 +497,8 @@ bool visit_is_dealloc(Visitor *v);* @obj must be non-NULL. Input visitors set *@obj to the value; * other visitors will leave *@obj unchanged. * -* On failure, store an error through @errp. +* On failure, store an error through @errp. Can happen only when @v +* is an input visitor. */ void visit_type_int (Visitor *v,const char *name,int64_t *obj,Error **errp);
@@ -573,7 +576,8 @@ void visit_type_size(Visitor *v, const char *name, uint64_t *obj,* @obj must be non-NULL. Input visitors set *@obj to the value; * other visitors will leave *@obj unchanged. * -* On failure, store an error through @errp. +* On failure, store an error through @errp. Can happen only when @v +* is an input visitor. */ void visit_type_bool (Visitor *v,const char *name,bool *obj,Error **errp);
@@ -592,6 +596,7 @@ void visit_type_bool(Visitor *v, const char *name, bool *obj, Error **errp);* into @obj for use by an output visitor. * * On failure, set *@obj to NULL and store an error through @errp. +* Can happen only when @v is an input visitor. * * FIXME: Callers that try to output NULL *obj should not be allowed. */
@@ -607,7 +612,8 @@ void visit_type_str(Visitor *v, const char *name, char **obj, Error **errp);* other visitors will leave *@obj unchanged. Visitors should * document if infinity or NaN are not permitted. * -* On failure, store an error through @errp. +* On failure, store an error through @errp. Can happen only when @v +* is an input visitor. */ void visit_type_number (Visitor *v,const char *name,double *obj,Error **errp);
@@ -623,6 +629,7 @@ void visit_type_number(Visitor *v, const char *name, double *obj,* for output visitors. * * On failure, set *@obj to NULL and store an error through @errp. +* Can happen only when @v is an input visitor. * * Note that some kinds of input can't express arbitrary QObject. * E.g. the visitor returned by qobject_input_visitor_new_keyval()
@@ -640,6 +647,7 @@ void visit_type_any(Visitor *v, const char *name, QObject **obj, Error **errp);* other visitors ignore *@obj. * * On failure, set *@obj to NULL and store an error through @errp. +* Can happen only when @v is an input visitor. */ void visit_type_null (Visitor *v,const char *name,QNull **obj,Error **errp);
block.c +1 -8
@@ -2982,7 +2982,6 @@ BdrvChild *bdrv_open_child(const char *filename,BlockDriverState *bdrv_open_blockdev_ref (BlockdevRef *ref,Error **errp) {BlockDriverState *bs =NULL ; -Error *local_err =NULL ;QObject *obj =NULL ;QDict *qdict =NULL ;const char *reference =NULL ;
@@ -2995,11 +2994,7 @@ BlockDriverState *bdrv_open_blockdev_ref(BlockdevRef *ref, Error **errp)assert (ref->type ==QTYPE_QDICT ); v =qobject_output_visitor_new (&obj); -visit_type_BlockdevOptions (v,NULL , &options, &local_err); -if (local_err) { -error_propagate (errp, local_err); - goto fail; - } +visit_type_BlockdevOptions (v,NULL , &options, &error_abort);visit_complete (v, &obj); qdict =qobject_to (QDict, obj);
@@ -3017,8 +3012,6 @@ BlockDriverState *bdrv_open_blockdev_ref(BlockdevRef *ref, Error **errp) bs =bdrv_open_inherit (NULL , reference, qdict,0 ,NULL ,NULL , errp); obj =NULL ; - -fail:qobject_unref (obj);visit_free (v);return bs;
block/sheepdog.c +1 -8
@@ -1854,19 +1854,12 @@ static int sd_create_prealloc(BlockdevOptionsSheepdog *location, int64_t size,Visitor *v;QObject *obj =NULL ;QDict *qdict; -Error *local_err =NULL ;int ret; v =qobject_output_visitor_new (&obj); -visit_type_BlockdevOptionsSheepdog (v,NULL , &location, &local_err); +visit_type_BlockdevOptionsSheepdog (v,NULL , &location, &error_abort);visit_free (v); -if (local_err) { -error_propagate (errp, local_err); -qobject_unref (obj); -return -EINVAL ; - } - qdict =qobject_to (QDict, obj);qdict_flatten (qdict);
blockdev.c +2 -14
@@ -3725,14 +3725,8 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp)QObject *obj;Visitor *v =qobject_output_visitor_new (&obj);QDict *qdict; -Error *local_err =NULL ; - -visit_type_BlockdevOptions (v,NULL , &options, &local_err); -if (local_err) { -error_propagate (errp, local_err); - goto fail; - } +visit_type_BlockdevOptions (v,NULL , &options, &error_abort);visit_complete (v, &obj); qdict =qobject_to (QDict, obj);
@@ -3760,7 +3754,6 @@ void qmp_x_blockdev_reopen(BlockdevOptions *options, Error **errp)AioContext *ctx;QObject *obj;Visitor *v =qobject_output_visitor_new (&obj); -Error *local_err =NULL ;BlockReopenQueue *queue;QDict *qdict;
@@ -3777,12 +3770,7 @@ void qmp_x_blockdev_reopen(BlockdevOptions *options, Error **errp) }/* Put all options in a QDict and flatten it */ -visit_type_BlockdevOptions (v,NULL , &options, &local_err); -if (local_err) { -error_propagate (errp, local_err); - goto fail; - } - +visit_type_BlockdevOptions (v,NULL , &options, &error_abort);visit_complete (v, &obj); qdict =qobject_to (QDict, obj);
hw/core/machine-hmp-cmds.c +1 -1
@@ -113,7 +113,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)while (m) { v =string_output_visitor_new (false, &str); -visit_type_uint16List (v,NULL , &m->value->host_nodes,NULL ); +visit_type_uint16List (v,NULL , &m->value->host_nodes, &error_abort);monitor_printf (mon,"memory backend: %s\n" , m->value->id);monitor_printf (mon," size: %" PRId64"\n" , m->value->size); monitor_printf(mon, " merge: %s\n",
monitor/hmp-cmds.c +2 -1
@@ -334,7 +334,8 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)Visitor *v;char *str; v =string_output_visitor_new (false, &str); -visit_type_uint32List (v,NULL , &info->postcopy_vcpu_blocktime,NULL ); +visit_type_uint32List (v,NULL , &info->postcopy_vcpu_blocktime, + &error_abort);visit_complete (v, &str);monitor_printf (mon,"postcopy vcpu blocktime: %s\n" , str);g_free (str);
Signature · 1 line
2.21.1
PATCH 3/13 qapi: Fix typo in visit_start_list()'s contract
In reply to Markus Armbruster--- include/qapi/visitor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/qapi/visitor.h +2 -2
@@ -345,9 +345,9 @@ void visit_end_struct(Visitor *v, void **obj);* input visitors set *@list to NULL. * * After visit_start_list() succeeds, the caller may visit its members -* one after the other. A real visit (where @obj is non-NULL) uses +* one after the other. A real visit (where @list is non-NULL) uses * visit_next_list() for traversing the linked list, while a virtual -* visit (where @obj is NULL) uses other means. For each list +* visit (where @list is NULL) uses other means. For each list * element, call the appropriate visit_type_FOO() with name set to * NULL and obj set to the address of the value member of the list * element. Finally, visit_end_list() needs to be called with the
Signature · 1 line
2.21.1
PATCH 5/13 qapi: Polish prose in visitor.h
In reply to Markus Armbruster--- include/qapi/visitor.h | 104 +++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 50 deletions(-)
include/qapi/visitor.h +54 -50
@@ -25,19 +25,21 @@* for doing work at each node of a QAPI graph; it can also be used * for a virtual walk, where there is no actual QAPI C struct. * -* There are four kinds of visitor classes: input visitors (QObject, -* string, and QemuOpts) parse an external representation and build -* the corresponding QAPI graph, output visitors (QObject and string) take -* a completed QAPI graph and generate an external representation, the -* dealloc visitor can take a QAPI graph (possibly partially -* constructed) and recursively free its resources, and the clone -* visitor performs a deep clone of one QAPI object to another. While -* the dealloc and QObject input/output visitors are general, the string, -* QemuOpts, and clone visitors have some implementation limitations; -* see the documentation for each visitor for more details on what it -* supports. Also, see visitor-impl.h for the callback contracts -* implemented by each visitor, and docs/devel/qapi-code-gen.txt for more -* about the QAPI code generator. +* There are four kinds of visitors: input visitors (QObject, string, +* and QemuOpts) parse an external representation and build the +* corresponding QAPI object, output visitors (QObject and string) +* take a QAPI object and generate an external representation, the +* dealloc visitor takes a QAPI object (possibly partially +* constructed) and recursively frees it, and the clone visitor +* performs a deep clone of a QAPI object. +* +* While the dealloc and QObject input/output visitors are general, +* the string, QemuOpts, and clone visitors have some implementation +* limitations; see the documentation for each visitor for more +* details on what it supports. Also, see visitor-impl.h for the +* callback contracts implemented by each visitor, and +* docs/devel/qapi-code-gen.txt for more about the QAPI code +* generator. * * All of the visitors are created via: *
@@ -45,11 +47,15 @@* * A visitor should be used for exactly one top-level visit_type_FOO() * or virtual walk; if that is successful, the caller can optionally -* call visit_complete() (for now, useful only for output visits, but -* safe to call on all visits). Then, regardless of success or -* failure, the user should call visit_free() to clean up resources. -* It is okay to free the visitor without completing the visit, if -* some other error is detected in the meantime. +* call visit_complete() (useful only for output visits, but safe to +* call on all visits). Then, regardless of success or failure, the +* user should call visit_free() to clean up resources. It is okay to +* free the visitor without completing the visit, if some other error +* is detected in the meantime. +* +* The clone and dealloc visitor should not be used directly outside +* of QAPI code. Use the qapi_free_FOO() and QAPI_CLONE() instead, +* described below. * * All QAPI types have a corresponding function with a signature * roughly compatible with this:
@@ -68,22 +74,26 @@* alternate, @name should equal the name used for visiting the * alternate. * -* The visit_type_FOO() functions expect a non-null @obj argument; -* they allocate *@obj during input visits, leave it unchanged on -* output visits, and recursively free any resources during a dealloc -* visit. Each function also takes the customary @errp argument (see +* The visit_type_FOO() functions take a non-null @obj argument; they +* allocate *@obj during input visits, leave it unchanged during +* output and clone visits, and free it (recursively) during a dealloc +* visit. +* +* Each function also takes the customary @errp argument (see * qapi/error.h for details), for reporting any errors (such as if a * member @name is not present, or is present but not the specified * type). * * If an error is detected during visit_type_FOO() with an input -* visitor, then *@obj will be NULL for pointer types, and left -* unchanged for scalar types. Using an output or clone visitor with -* an incomplete object has undefined behavior (other than a special -* case for visit_type_str() treating NULL like ""), while the dealloc -* visitor safely handles incomplete objects. Since input visitors -* never produce an incomplete object, such an object is possible only -* by manual construction. +* visitor, then *@obj will be set to NULL for pointer types, and left +* unchanged for scalar types. +* +* Using an output or clone visitor with an incomplete object has +* undefined behavior (other than a special case for visit_type_str() +* treating NULL like ""), while the dealloc visitor safely handles +* incomplete objects. Since input visitors never produce an +* incomplete object, such an object is possible only by manual +* construction. * * For the QAPI object types (structs, unions, and alternates), there * is an additional generated function in qapi-visit-MODULE.h
@@ -100,23 +110,20 @@* * void qapi_free_FOO(FOO *obj); * -* where behaves like free() in that @obj may be NULL. Such objects -* may also be used with the following macro, provided alongside the -* clone visitor: +* Does nothing when @obj is NULL. +* +* Such objects may also be used with macro * * Type *QAPI_CLONE(Type, src); * -* in order to perform a deep clone of @src. Because of the generated -* qapi_free functions and the QAPI_CLONE() macro, the clone and -* dealloc visitor should not be used directly outside of QAPI code. +* in order to perform a deep clone of @src. * -* QAPI types can also inherit from a base class; when this happens, a -* function is generated for easily going from the derived type to the -* base type: +* For QAPI types can that inherit from a base type, a function is +* generated for going from the derived type to the base type: * * BASE *qapi_CHILD_base(CHILD *obj); * -* For a real QAPI struct, typical input usage involves: +* Typical input visitor usage involves: * * <example> * Foo *f;
@@ -153,7 +160,7 @@* qapi_free_FooList(l); * </example> * -* Similarly, typical output usage is: +* Typical output visitor usage: * * <example> * Foo *f = ...obtain populated object...
@@ -172,17 +179,8 @@* visit_free(v); * </example> * -* When visiting a real QAPI struct, this file provides several -* helpers that rely on in-tree information to control the walk: -* visit_optional() for the 'has_member' field associated with -* optional 'member' in the C struct; and visit_next_list() for -* advancing through a FooList linked list. Similarly, the -* visit_is_input() helper makes it possible to write code that is -* visitor-agnostic everywhere except for cleanup. Only the generated -* visit_type functions need to use these helpers. -* * It is also possible to use the visitors to do a virtual walk, where -* no actual QAPI struct is present. In this situation, decisions +* no actual QAPI object is present. In this situation, decisions * about what needs to be walked are made by the calling code, and * structured visits are split between pairs of start and end methods * (where the end method must be called if the start function
@@ -227,6 +225,12 @@* out: * visit_free(v); * </example> +* +* This file provides helpers for use by the generated +* visit_type_FOO(): visit_optional() for the 'has_member' field +* associated with optional 'member' in the C struct, +* visit_next_list() for advancing through a FooList linked list, and +* visit_is_input() for cleaning up on failure. */ /*** Useful types ***/
Signature · 1 line
2.21.1
PATCH 9/13 qapi: Assert non-input visitors see only valid narrow integers
In reply to Markus Armbrustervisit_type_intN() and visit_type_uintN() fail when the value is out of bounds.
This is appropriate with an input visitor: the value comes from input, and input may be bad.
It should never happen with the other visitors: the value comes from the caller, and callers must keep it within bounds. Assert that.
--- qapi/qapi-visit-core.c | 6 ++++++ 1 file changed, 6 insertions(+)
qapi/qapi-visit-core.c +6 -0
@@ -160,10 +160,13 @@ static void visit_type_uintN(Visitor *v, uint64_t *obj, const char *name,Error *err =NULL ;uint64_t value = *obj; +assert (v->type ==VISITOR_INPUT || value <= max); + v->type_uint64 (v, name, &value, &err);if (err) {error_propagate (errp, err); }else if (value > max) { +assert (v->type ==VISITOR_INPUT );error_setg (errp,QERR_INVALID_PARAMETER_VALUE , name ? name :"null" , type); }else {
@@ -219,10 +222,13 @@ static void visit_type_intN(Visitor *v, int64_t *obj, const char *name,Error *err =NULL ;int64_t value = *obj; +assert (v->type ==VISITOR_INPUT || (value >= min && value <= max)); + v->type_int64 (v, name, &value, &err);if (err) {error_propagate (errp, err); }else if (value < min || value > max) { +assert (v->type ==VISITOR_INPUT );error_setg (errp,QERR_INVALID_PARAMETER_VALUE , name ? name :"null" , type); }else {
Signature · 1 line
2.21.1
PATCH 2/13 qapi: Fix the virtual walk example in visitor.h's big comment
In reply to Markus ArmbrusterCall visit_check_list(). Missed in commit a4a1c70dc7 "qapi: Make input visitors detect unvisited list tails".
Drop an irrelevant error_propagate() while there.
--- include/qapi/visitor.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
include/qapi/visitor.h +3 -1
@@ -215,6 +215,9 @@* goto outlist; * } * outlist: +* if (!err) { +* visit_check_list(v, &err); +* } * visit_end_list(v, NULL); * if (!err) { * visit_check_struct(v, &err);
@@ -222,7 +225,6 @@* outobj: * visit_end_struct(v, NULL); * out: -* error_propagate(errp, err); * visit_free(v); * </example> */
Signature · 1 line
2.21.1
PATCH 13/13 qom: Simplify object_property_get_enum()
In reply to Markus Armbruster--- qom/object.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
qom/object.c +1 -3
@@ -1550,11 +1550,9 @@ int object_property_get_enum(Object *obj, const char *name, }visit_complete (v, &str);visit_free (v); - v =string_input_visitor_new (str); -visit_type_enum (v, name, &ret, enumprop->lookup, errp); + ret =qapi_enum_parse (enumprop->lookup, str,-1 , errp);g_free (str); -visit_free (v);return ret; }
Signature · 1 line
2.21.1
PATCH 4/13 qapi: Document @errp usage more thoroughly in visitor.h
In reply to Markus Armbruster--- include/qapi/visitor.h | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-)
include/qapi/visitor.h +23 -14
@@ -284,9 +284,7 @@ void visit_free(Visitor *v);* into *@obj. @obj may also be NULL for a virtual walk, in which * case @size is ignored. * -* @errp obeys typical error usage, and reports failures such as a -* member @name is not present, or present but not an object. On -* error, input visitors set *@obj to NULL. +* On failure, set *@obj to NULL and store an error through @errp. * * After visit_start_struct() succeeds, the caller may visit its * members one after the other, passing the member's name and address
@@ -303,8 +301,7 @@ void visit_start_struct(Visitor *v, const char *name, void **obj,/* * Prepare for completing an object visit. * -* @errp obeys typical error usage, and reports failures such as -* unparsed keys remaining in the input stream. +* On failure, store an error through @errp. * * Should be called prior to visit_end_struct() if all other * intermediate visit steps were successful, to allow the visitor one
@@ -340,9 +337,7 @@ void visit_end_struct(Visitor *v, void **obj);* allow @list to be NULL for a virtual walk, in which case @size is * ignored. * -* @errp obeys typical error usage, and reports failures such as a -* member @name is not present, or present but not a list. On error, -* input visitors set *@list to NULL. +* On failure, set *@list to NULL and store an error through @errp. * * After visit_start_list() succeeds, the caller may visit its members * one after the other. A real visit (where @list is non-NULL) uses
@@ -376,8 +371,7 @@ GenericList *visit_next_list(Visitor *v, GenericList *tail, size_t size);/* * Prepare for completing a list visit. * -* @errp obeys typical error usage, and reports failures such as -* unvisited list tail remaining in the input stream. +* On failure, store an error through @errp. * * Should be called prior to visit_end_list() if all other * intermediate visit steps were successful, to allow the visitor one
@@ -409,8 +403,10 @@ void visit_end_list(Visitor *v, void **list);* * @obj must not be NULL. Input and clone visitors use @size to * determine how much memory to allocate into *@obj, then determine -* the qtype of the next thing to be visited, stored in (*@obj)->type. -* Other visitors will leave @obj unchanged. +* the qtype of the next thing to be visited, and store it in +* (*@obj)->type. Other visitors leave @obj unchanged. +* +* On failure, set *@obj to NULL and store an error through @errp. * * If successful, this must be paired with visit_end_alternate() with * the same @obj to clean up, even if visiting the contents of the
@@ -463,8 +459,9 @@ bool visit_optional(Visitor *v, const char *name, bool *present);* * Currently, all input visitors parse text input, and all output * visitors produce text output. The mapping between enumeration -* values and strings is done by the visitor core, using @strings; it -* should be the ENUM_lookup array from visit-types.h. +* values and strings is done by the visitor core, using @lookup. +* +* On failure, store an error through @errp. * * May call visit_type_str() under the hood, and the enum visit may * fail even if the corresponding string visit succeeded; this implies
@@ -488,6 +485,8 @@ bool visit_is_input(Visitor *v);* * @obj must be non-NULL. Input visitors set *@obj to the value; * other visitors will leave *@obj unchanged. +* +* On failure, store an error through @errp. */ void visit_type_int (Visitor *v,const char *name,int64_t *obj,Error **errp);
@@ -564,6 +563,8 @@ void visit_type_size(Visitor *v, const char *name, uint64_t *obj,* * @obj must be non-NULL. Input visitors set *@obj to the value; * other visitors will leave *@obj unchanged. +* +* On failure, store an error through @errp. */ void visit_type_bool (Visitor *v,const char *name,bool *obj,Error **errp);
@@ -581,6 +582,8 @@ void visit_type_bool(Visitor *v, const char *name, bool *obj, Error **errp);* It is safe to cast away const when preparing a (const char *) value * into @obj for use by an output visitor. * +* On failure, set *@obj to NULL and store an error through @errp. +* * FIXME: Callers that try to output NULL *obj should not be allowed. */ void visit_type_str (Visitor *v,const char *name,char **obj,Error **errp);
@@ -594,6 +597,8 @@ void visit_type_str(Visitor *v, const char *name, char **obj, Error **errp);* @obj must be non-NULL. Input visitors set *@obj to the value; * other visitors will leave *@obj unchanged. Visitors should * document if infinity or NaN are not permitted. +* +* On failure, store an error through @errp. */ void visit_type_number (Visitor *v,const char *name,double *obj,Error **errp);
@@ -608,6 +613,8 @@ void visit_type_number(Visitor *v, const char *name, double *obj,* other visitors will leave *@obj unchanged. *@obj must be non-NULL * for output visitors. * +* On failure, set *@obj to NULL and store an error through @errp. +* * Note that some kinds of input can't express arbitrary QObject. * E.g. the visitor returned by qobject_input_visitor_new_keyval() * can't create numbers or booleans, only strings.
@@ -622,6 +629,8 @@ void visit_type_any(Visitor *v, const char *name, QObject **obj, Error **errp);* * @obj must be non-NULL. Input visitors set *@obj to the value; * other visitors ignore *@obj. +* +* On failure, set *@obj to NULL and store an error through @errp. */ void visit_type_null (Visitor *v,const char *name,QNull **obj,Error **errp);
Signature · 1 line
2.21.1
PATCH 7/13 qapi: Fix Visitor contract for start_alternate()
In reply to Markus ArmbrusterThe 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().
--- include/qapi/visitor-impl.h | 5 ++--- qapi/qapi-dealloc-visitor.c | 7 ------- 2 files changed, 2 insertions(+), 10 deletions(-)
include/qapi/visitor-impl.h +2 -3
@@ -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 */
qapi/qapi-dealloc-visitor.c +0 -7
@@ -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;
Signature · 1 line
2.21.1
Re: [PATCH 01/13] qapi: Belatedly update visitor.h's big comment for QAPI modules
In reply to Markus ArmbrusterQuoted 5 lines · Markus Armbruster
Signed-off-by Markus Armbruster <[email protected]>--- include/qapi/visitor.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 02/13] qapi: Fix the virtual walk example in visitor.h's big comment
In reply to Markus ArmbrusterQuoted 4 lines · Markus Armbruster
Call
visit_check_list(). Missed in commita4a1c70dc7"qapi: Make input visitors detect unvisited list tails".Drop an irrelevant
error_propagate()while there.
Aha - you found this because of your error cleanup work ;)
Quoted 6 lines
Signed-off-by Markus Armbruster <[email protected]>--- include/qapi/visitor.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 03/13] qapi: Fix typo in visit_start_list()'s contract
In reply to Markus ArmbrusterQuoted 4 lines · Markus Armbruster
Signed-off-by Markus Armbruster <[email protected]>--- include/qapi/visitor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Too much copy-and-paste in the original ;)
Quoted 18 lines
include/qapi/visitor.h +2
-2@@ -345,9 +345,9 @@ void visit_end_struct(Visitor *v, void **obj);* input visitors set *@list to NULL. * * After visit_start_list() succeeds, the caller may visit its members -* one after the other. A real visit (where @obj is non-NULL) uses +* one after the other. A real visit (where @list is non-NULL) uses * visit_next_list() for traversing the linked list, while a virtual -* visit (where @obj is NULL) uses other means. For each list +* visit (where @list is NULL) uses other means. For each list * element, call the appropriate visit_type_FOO() with name set to * NULL and obj set to the address of the value member of the list * element. Finally, visit_end_list() needs to be called with the
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 04/13] qapi: Document @errp usage more thoroughly in visitor.h
In reply to Markus ArmbrusterQuoted 5 lines · Markus Armbruster
Signed-off-by Markus Armbruster <[email protected]>--- include/qapi/visitor.h | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 05/13] qapi: Polish prose in visitor.h
In reply to Markus ArmbrusterQuoted 5 lines · Markus Armbruster
Signed-off-by Markus Armbruster <[email protected]>--- include/qapi/visitor.h | 104 +++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 50 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 06/13] qapi: Assert incomplete object occurs only in dealloc visitor
In reply to Markus ArmbrusterQuoted 7 lines · Markus Armbruster
Signed-off-by Markus Armbruster <[email protected]>--- include/qapi/visitor.h | 5 +++++ qapi/qapi-visit-core.c | 5 +++++ scripts/qapi/visit.py | 4 ++++ 3 files changed, 14 insertions(+)
Nice enforcement of the contract.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 07/13] qapi: Fix Visitor contract for start_alternate()
In reply to Markus ArmbrusterQuoted 11 lines · Markus Armbruster
The contract demands
v->start_alternate()for input and dealloc visitors, butvisit_start_alternate()actually requires it for input and clone visitors. Fix the contract, and delete superfluousqapi_dealloc_start_alternate().Signed-off-by Markus Armbruster <[email protected]>--- include/qapi/visitor-impl.h | 5 ++--- qapi/qapi-dealloc-visitor.c | 7 ------- 2 files changed, 2 insertions(+), 10 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 08/13] qapi: Assert output visitors see only valid enum values
In reply to Markus ArmbrusterQuoted 10 lines · Markus Armbruster
output_type_enum()fails when *obj is not a valid value of the enum type. Should not happen. Drop the check, along with its unit tests. qapi_enum_lookup()'s assertion still guards.Signed-off-by Markus Armbruster <[email protected]>--- qapi/qapi-visit-core.c | 9 ------- tests/test-qobject-output-visitor.c | 39 ----------------------------- tests/test-string-output-visitor.c | 19 -------------- 3 files changed, 67 deletions(-)
Nice cleanup.
The commit message implies adding an assertion; but in reality, the change is deleting dead code (because we already have the assertion in place). Maybe it's worth updating the subject?
qapi/qapi-visit-core.c static void output_type_enum(Visitor *v, const char *name, int *obj, · line 351
Quoted 8 lines
qapi/qapi-visit-core.c +0
-8-/* -* TODO why is this an error, not an assertion? If assertion: -* delete, and rely on qapi_enum_lookup() -*/ -if (value <0 || value >= lookup->size) { -error_setg (errp,QERR_INVALID_PARAMETER , name ? name :"null" ); -return ; - }
The comment being deleted is what points out the assertion that already exists.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 09/13] qapi: Assert non-input visitors see only valid narrow integers
In reply to Markus ArmbrusterQuoted 6 lines · Markus Armbruster
visit_type_intN()andvisit_type_uintN()fail when the value is out of bounds.This is appropriate with an input visitor: the value comes from input, and input may be bad.
Quoted 8 lines
It should never happen with the other visitors: the value comes from the caller, and callers must keep it within bounds. Assert that.
Signed-off-by Markus Armbruster <[email protected]>--- qapi/qapi-visit-core.c | 6 ++++++ 1 file changed, 6 insertions(+)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 10/13] qapi: Clean up visitor's recovery from input with invalid type
In reply to Markus ArmbrusterQuoted 10 lines · Markus Armbruster
An alternate type's
visit_type_FOO()fails when it runs into an invalid ->type. If it's an input visit, we then need to free the the object we got fromvisit_start_alternate(). We do that withqapi_free_FOO(), which uses the dealloc visitor.Trouble is that object is in a bad state: its ->type is invalid. So the dealloc visitor will run into the same error again, and the error recovery skips deallocating the alternate's (invalid) alternative. This is a roundabout way to
g_free()the alternate.
Quoted 7 lines
Simplify: replace the
qapi_free_FOO()byg_free().Signed-off-by Markus Armbruster <[email protected]>--- scripts/qapi/visit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Required looking at what gets generated into qapi_free_FOO() as well as when visit_start_alternate() can fail, but makes sense.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 11/13] qapi: Assert non-input visitors see only valid alternate tags
In reply to Markus ArmbrusterQuoted 7 lines · Markus Armbruster
An alternate type's
visit_type_FOO()fails when it runs into an invalid ->type.This is appropriate with an input visitor:
visit_start_alternate()sets ->type according to the input, and bad input can lead to bad ->type.
Quoted 8 lines
It should never happen with an output, clone or dealloc visitor: if it did, the alternate being output, cloned or deallocated would be messed up beyond repair. Assert that.
Signed-off-by Markus Armbruster <[email protected]>--- scripts/qapi/visit.py | 1 + 1 file changed, 1 insertion(+)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 10/13] qapi: Clean up visitor's recovery from input with invalid type
In reply to Eric BlakeQuoted 19 lines · Eric Blake
Quoted 10 lines · Markus Armbruster
An alternate type's
visit_type_FOO()fails when it runs into an invalid ->type. If it's an input visit, we then need to free the the object we got from visit_start_alternate(). We do that withqapi_free_FOO(), which uses the dealloc visitor.Trouble is that object is in a bad state: its ->type is invalid. So the dealloc visitor will run into the same error again, and the error recovery skips deallocating the alternate's (invalid) alternative. This is a roundabout way to
g_free()the alternate.Quoted 7 lines
Simplify: replace the
qapi_free_FOO()byg_free().Signed-off-by Markus Armbruster <[email protected]>---
scripts/qapi/visit.py| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 3 lines
Required looking at what gets generated into
qapi_free_FOO()as well as whenvisit_start_alternate()can fail, but makes sense.Reviewed-by Eric Blake <[email protected]>
Actually, I'm having second thoughts. As an example, look at the generated:
Quoted 11 lines
void
visit_type_BlockDirtyBitmapMergeSource(Visitor *v, const char *name, BlockDirtyBitmapMergeSource **obj, Error **errp){ Error *err = NULL; visit_start_alternate(v, name, (GenericAlternate **)obj, sizeof(**obj), &err); if (err) { goto out; } if (!*obj) { goto out_obj;
[1]
Quoted 4 lines
}
switch ((*obj)->type) {
case QTYPE_QSTRING:
visit_type_str(v, name, &(*obj)->u.local, &err);[2]
Quoted 5 lines
break;
case QTYPE_QDICT:
visit_start_struct(v, name, NULL, 0, &err);
if (err) {
break;[3]
Quoted 4 lines
}
visit_type_BlockDirtyBitmap_members(v, &(*obj)->u.external, &err);
if (!err) {
visit_check_struct(v, &err);[4]
Quoted 8 lines
}
visit_end_struct(v, NULL);
break;
case QTYPE_NONE:
abort();
default:
error_setg(&err, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"BlockDirtyBitmapMergeSource");[5]
Quoted 5 lines
}
out_obj:
visit_end_alternate(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_BlockDirtyBitmapMergeSource(*obj);If we got here, we must have failed at any of the points mentioned above.
If [1], visit_start_alternate() failed, but *obj is NULL and both qapi_free_FOO(NULL) and g_free(NULL) are safe.
If [2], visit_type_str() failed, so *obj is allocated but the embedded string (here, u.local) was left NULL. qapi_free_FOO() then does nothing further than g_free(obj).
If [3], visit_start_struct() failed, the embedded dict (here, u.external) was left NULL. qapi_free_FOO() then does nothing further than g_free(obj).
If [5], we have the wrong ->type. As pointed out by this commit, qapi_free_FOO() does nothing further than g_free(obj).
But what happens in [4]? Here, the embedded dict was allocated, but we then failed while parsing its members. That leaves us in a partially-allocated state, and g_free(NULL) does NOT recursively visit that partial allocation. I think this patch is prone to a memory leak unless you _also_ patch things to free any dict branch on failure (perhaps during the QTYPE_QDICT case label, rather than here at the end).
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 12/13] qapi: Only input visitors can actually fail
In reply to Markus ArmbrusterQuoted 6 lines · Markus Armbruster
The previous few commits have made this more obvious, and removed the one exception. Time to clarify the documentation, and drop dead error checking.
Signed-off-by Markus Armbruster <[email protected]>---
I guess the only other failures an output visitor might encounter are out-of-memory, or invalid contents (such as a NaN in a 'number', or invalid encoding in a string...), and aborting on those errors at the point they happen rather than trying to return errp makes sense.
It makes for a nice conceptual result: input parsing fails on unexpected input, but output visitors should never be used on invalid data.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 13/13] qom: Simplify object_property_get_enum()
In reply to Markus ArmbrusterQuoted 5 lines · Markus Armbruster
Signed-off-by Markus Armbruster <[email protected]>--- qom/object.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 08/13] qapi: Assert output visitors see only valid enum values
In reply to Eric BlakeQuoted 12 lines · Eric Blake
Quoted 10 lines · Markus Armbruster
output_type_enum()fails when *obj is not a valid value of the enum type. Should not happen. Drop the check, along with its unit tests. qapi_enum_lookup()'s assertion still guards.Signed-off-by Markus Armbruster <[email protected]>--- qapi/qapi-visit-core.c | 9 ------- tests/test-qobject-output-visitor.c | 39 ----------------------------- tests/test-string-output-visitor.c | 19 -------------- 3 files changed, 67 deletions(-)
Quoted 5 lines
Nice cleanup.
The commit message implies adding an assertion; but in reality, the change is deleting dead code (because we already have the assertion in place). Maybe it's worth updating the subject?
I tried to say it in the body: "qapi_enum_lookup()'s assertion still guards." I could replace that by "This unmasks qapi_enum_lookup()'s assertion." Okay? Better ideas?
Quoted 11 lines
Reviewed-by Eric Blake <[email protected]>qapi/qapi-visit-core.c static void output_type_enum(Visitor *v, const char *name, int *obj, · line 351
Quoted 8 lines
qapi/qapi-visit-core.c +0
-8-/* -* TODO why is this an error, not an assertion? If assertion: -* delete, and rely on qapi_enum_lookup() -*/ -if (value <0 || value >= lookup->size) { -error_setg (errp,QERR_INVALID_PARAMETER , name ? name :"null" ); -return ; - }
Quoted 2 lines
The comment being deleted is what points out the assertion that already exists.
Thanks!
Re: [PATCH 10/13] qapi: Clean up visitor's recovery from input with invalid type
In reply to Eric BlakeQuoted 86 lines · Eric Blake
Quoted 19 lines · Eric Blake
Quoted 10 lines · Markus Armbruster
An alternate type's
visit_type_FOO()fails when it runs into an invalid ->type. If it's an input visit, we then need to free the the object we got from visit_start_alternate(). We do that withqapi_free_FOO(), which uses the dealloc visitor.Trouble is that object is in a bad state: its ->type is invalid. So the dealloc visitor will run into the same error again, and the error recovery skips deallocating the alternate's (invalid) alternative. This is a roundabout way to
g_free()the alternate.Quoted 7 lines
Simplify: replace the
qapi_free_FOO()byg_free().Signed-off-by Markus Armbruster <[email protected]>---
scripts/qapi/visit.py| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)Quoted 4 lines
Required looking at what gets generated into
qapi_free_FOO()as well as whenvisit_start_alternate()can fail, but makes sense.Reviewed-by Eric Blake <[email protected]>Actually, I'm having second thoughts. As an example, look at the generated:
Quoted 11 lines
void
visit_type_BlockDirtyBitmapMergeSource(Visitor *v, const char *name, BlockDirtyBitmapMergeSource **obj, Error **errp){ Error *err = NULL; visit_start_alternate(v, name, (GenericAlternate **)obj, sizeof(**obj), &err); if (err) { goto out; } if (!*obj) { goto out_obj;[1]
Quoted 4 lines
} switch ((*obj)->type) { case QTYPE_QSTRING: visit_type_str(v, name, &(*obj)->u.local, &err);[2]
Quoted 5 lines
break; case QTYPE_QDICT: visit_start_struct(v, name, NULL, 0, &err); if (err) { break;[3]
Quoted 4 lines
} visit_type_BlockDirtyBitmap_members(v, &(*obj)->u.external, &err); if (!err) { visit_check_struct(v, &err);[4]
Quoted 8 lines
} visit_end_struct(v, NULL); break; case QTYPE_NONE: abort(); default: error_setg(&err, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", "BlockDirtyBitmapMergeSource");[5]
Quoted 5 lines
} out_obj: visit_end_alternate(v, (void **)obj); if (err && visit_is_input(v)) { qapi_free_BlockDirtyBitmapMergeSource(*obj);If we got here, we must have failed at any of the points mentioned above.
If [1],
visit_start_alternate()failed, but *obj is NULL and bothqapi_free_FOO(NULL)andg_free(NULL)are safe.If [2],
visit_type_str()failed, so *obj is allocated but the embedded string (here, u.local) was left NULL.qapi_free_FOO()then does nothing further thang_free(obj).If [3],
visit_start_struct()failed, the embedded dict (here, u.external) was left NULL.qapi_free_FOO()then does nothing further thang_free(obj).If [5], we have the wrong ->type. As pointed out by this commit,
qapi_free_FOO()does nothing further thang_free(obj).
Quoted 7 lines
But what happens in [4]? Here, the embedded dict was allocated, but we then failed while parsing its members. That leaves us in a partially-allocated state, and
g_free(NULL)does NOT recursively visit that partial allocation. I think this patch is prone to a memory leak unless you _also_ patch things to free any dict branch on failure (perhaps during theQTYPE_QDICTcase label, rather than here at the end).
You're right.
Let's change cleanup only for the default case, like this:
default:
error_setg(&err, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"BlockDirtyBitmapMergeSource");
+ g_free(*obj);
+ *obj = NULL;
}
out_obj:
visit_end_alternate(v, (void **)obj);
if (err && visit_is_input(v)) {
qapi_free_BlockDirtyBitmapMergeSource(*obj);
*obj = NULL;
}
out:
error_propagate(errp, err);}
Thanks!