qapi visitor cleanups part 1 (post-introspection cleanups subset E)
Subsystems (3)
v10 cover qapi visitor cleanups part 1 (post-introspection cleanups subset E)
Based on qemu.git master. No pending prerequisites
Also available as a tag at this location:
git fetch git://repo.or.cz/qemu/ericb.git qapi-cleanupv10e
and will soon be part of my branch with the rest of the v5 series, at:
http://repo.or.cz/qemu/ericb.git/shortlog/refs/heads/qapi
v10 notes:
This is patches 1-20 of v9; 21-37 of that series will come later, but this half was relatively clean and should be ready to merge. Plus, this half includes the argument reordering, which touches a lot of the tree, so getting it in sooner rather than later will minimize rebase churn. A couple patches were split differently or retitled. Reviewed-by was kept on patches that didn't change in content (even if the content was split across different patch boundaries).
Most of the work here was addressing Markus' review comments, or rebasing later patches on top of earlier changes.
001/25:[0013] [FC] 'qobject: Document more shortcomings in our number handling' 002/25:[----] [--] 'qapi: Avoid use of misnamed DO_UPCAST()' 003/25:[----] [--] 'qapi: Drop dead dealloc visitor variable' 004/25:[down] 'qapi: Dealloc visitor does not need a type_size()' 005/25:[down] 'qapi: Drop dead parameter in gen_params()' 006/25:[down] 'hmp: Drop pointless allocation during qapi visit' 007/25:[down] 'hmp: Cache use of qapi visitor'
008/25:[down] 'vl: Ensure qapi visitor properly ends struct visit' 009/25:[0003] [FC] 'balloon: Improve use of qapi visitor' 010/25:[0004] [FC] 'qapi: Improve generated event use of qapi visitor' 011/25:[0004] [FC] 'qapi: Track all failures between visit_start/stop' 012/25:[down] 'qapi-visit: Kill unused visit_end_union()' 013/25:[0012] [FC] 'qapi: Prefer type_int64 over type_int in visitors' 014/25:[0012] [FC] 'qapi: Make all visitors supply uint64 callbacks' 015/25:[0014] [FC] 'qapi: Consolidate visitor small integer callbacks' 016/25:[0006] [FC] 'qapi: Don't cast Enum* to int*'
017/25:[----] [--] 'qom: Use typedef for Visitor'
018/25:[0004] [FC] 'qapi: Swap visit_* arguments for consistent 'name' placement' 019/25:[0005] [FC] 'qom: Swap 'name' next to visitor in ObjectPropertyAccessor' 020/25:[0010] [FC] 'qapi: Swap 'name' in visit_* callbacks to match public API' 021/25:[0018] [FC] 'qapi: Drop unused 'kind' for struct/enum visit' 022/25:[down] 'qapi: Tighten qmp_input_end_list()'
023/25:[0046] [FC] 'qapi: Drop unused error argument for list and implicit struct' 024/25:[0008] [FC] 'qmp: Fix reference-counting of qnull on empty output visit' 025/25:[0018] [FC] 'qmp: Don't abuse stack to track qmp-output root'
v9 notes:
https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg03504.html
Rebase to master, incorporate findings from Marc-André.
v8 notes:
https://lists.gnu.org/archive/html/qemu-devel/2015-12/msg03863.html
For notes here and earlier, look in the archives
include/qapi/visitor.h | 60 +++++---- include/qapi/visitor-impl.h | 63 +++++----- scripts/qapi-commands.py | 4 +- scripts/qapi-event.py | 16 ++- scripts/qapi-types.py | 2 +- scripts/qapi-visit.py | 72 ++++++----- scripts/qapi.py | 13 +- include/qom/object.h | 13 +- qapi/qapi-visit-core.c | 252 +++++++++++++++---------------------- backends/hostmem.c | 24 ++-- block/qapi.c | 2 +- blockdev.c | 4 +- bootdevice.c | 12 +- hmp.c | 18 +-- hw/acpi/core.c | 4 +- hw/acpi/ich9.c | 49 ++++---- hw/block/nvme.c | 12 +- hw/core/machine.c | 24 ++-- hw/core/qdev-properties-system.c | 44 +++---- hw/core/qdev-properties.c | 180 +++++++++++++------------- hw/core/qdev.c | 7 +- hw/i386/pc.c | 43 +++---- hw/ide/qdev.c | 12 +- hw/intc/xics.c | 20 +-- hw/isa/lpc_ich9.c | 7 +- hw/mem/pc-dimm.c | 6 +- hw/misc/edu.c | 6 +- hw/misc/tmp105.c | 12 +- hw/net/ne2000-isa.c | 14 ++- hw/pci-host/piix.c | 18 +-- hw/pci-host/q35.c | 23 ++-- hw/ppc/spapr_drc.c | 34 +++-- hw/usb/dev-storage.c | 12 +- hw/virtio/virtio-balloon.c | 30 ++--- memory.c | 26 ++-- net/dump.c | 12 +- net/filter-buffer.c | 14 ++- net/net.c | 4 +- numa.c | 6 +- qapi/opts-visitor.c | 52 ++++---- qapi/qapi-dealloc-visitor.c | 48 ++++--- qapi/qmp-input-visitor.c | 54 ++++---- qapi/qmp-output-visitor.c | 120 +++++++++--------- qapi/string-input-visitor.c | 62 +++++---- qapi/string-output-visitor.c | 54 ++++---- qemu-img.c | 11 +- qobject/json-parser.c | 6 +- qobject/qjson.c | 11 +- qom/object.c | 124 +++++++++--------- replay/replay-input.c | 4 +- target-i386/cpu.c | 97 +++++++------- target-ppc/translate_init.c | 12 +- tests/test-opts-visitor.c | 6 +- tests/test-qdev-global-props.c | 18 +-- tests/test-qmp-commands.c | 2 +- tests/test-qmp-input-strict.c | 28 ++--- tests/test-qmp-input-visitor.c | 80 ++++++------ tests/test-qmp-output-visitor.c | 36 +++--- tests/test-string-input-visitor.c | 34 ++--- tests/test-string-output-visitor.c | 16 +-- tests/test-visitor-serialization.c | 54 ++++---- util/qemu-sockets.c | 4 +- vl.c | 26 ++-- 63 files changed, 1067 insertions(+), 1066 deletions(-)
Signature · 1 line
2.5.0
PATCH v10 1/25 qobject: Document more shortcomings in our number handling
We've already documented that our JSON parsing is locale dependent; but we should also document that our JSON output has the same problem. Additionally, JSON requires finite values (you have to upgrade to JSON5 to get support for Inf or NaN), and our output truncates floating point numbers to the point of losing significant precision that could cause the receiver to read a different value.
Sadly, this series is not going to be the one that addresses these problems.
Fix some trailing whitespace I noticed in the vicinity.
---
v10: comment improvements, drop Marc-Andre's R-b.
v9: no change
v8: no change
v7: new patch
--- qobject/json-parser.c | 6 ++++-- qobject/qjson.c | 11 ++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-)
qobject/json-parser.c +4 -2
@@ -1,5 +1,5 @@/* -* JSON Parser +* JSON Parser * * Copyright IBM, Corp. 2009 *
@@ -518,7 +518,9 @@ static QObject *parse_literal(JSONParserContext *ctxt)/* fall through to JSON_FLOAT */ }case JSON_FLOAT : -/* FIXME dependent on locale */ +/* FIXME dependent on locale; a pervasive issue in QEMU */ +/* FIXME our lexer matches RFC 7159 in forbidding Inf or NaN, +* but those might be useful extensions beyond JSON */ return QOBJECT (qfloat_from_double (strtod (token->str,NULL )));default :abort ();
qobject/qjson.c +10 -1
@@ -237,6 +237,15 @@ static void to_json(const QObject *obj, QString *str, int pretty, int indent)char buffer[1024 ];int len; +/* FIXME: snprintf() is locale dependent; but JSON requires +* numbers to be formatted as if in the C locale. Dependence +* on C locale is a pervasive issue in QEMU. */ +/* FIXME: This risks printing Inf or NaN, which are not valid +* JSON values. */ +/* FIXME: the default precision of 6 for %f often causes +* rounding errors; we should be using DBL_DECIMAL_DIG (17), +* and only rounding to a shorter number if the result would +* still produce the same floating point value. */ len =snprintf (buffer,sizeof (buffer),"%f" ,qfloat_get_double (val));while (len >0 && buffer[len -1 ] =='0' ) { len--;
@@ -247,7 +256,7 @@ static void to_json(const QObject *obj, QString *str, int pretty, int indent) }else { buffer[len] =0 ; } - +qstring_append (str, buffer);break ; }
Signature · 1 line
2.5.0
PATCH v10 2/25 qapi: Avoid use of misnamed DO_UPCAST()
In reply to Eric BlakeThe macro DO_UPCAST() is incorrectly named: it converts from a parent class to a derived class (which is a downcast). Better, and more consistent with some of the other qapi visitors, is to use the container_of() macro through a to_FOO() helper. Names like 'to_ov()' may be a bit short, but for a static helper it doesn't hurt too much, and matches existing practice in files like qmp-input-visitor.c.
Our current definition of container_of() is weaker than DO_UPCAST(), in that it does not require the derived class to have Visitor as its first member, but this does not hurt our usage patterns in qapi visitors.
---
v10: improve commit message
v9: no change
v8: no change
v7: new patch
--- qapi/opts-visitor.c | 28 +++++++++++++++++----------- qapi/string-input-visitor.c | 23 ++++++++++++++--------- qapi/string-output-visitor.c | 21 +++++++++++++-------- 3 files changed, 44 insertions(+), 28 deletions(-)
qapi/opts-visitor.c +17 -11
@@ -89,6 +89,12 @@ struct OptsVisitor }; +static OptsVisitor *to_ov (Visitor *v) +{ +return container_of (v, OptsVisitor, visitor); +} + +static void destroy_list (gpointer list) {
@@ -121,7 +127,7 @@ static void opts_start_struct(Visitor *v, void **obj, const char *kind, const char *name, size_t size, Error **errp) { -OptsVisitor *ov =DO_UPCAST (OptsVisitor, visitor, v); +OptsVisitor *ov =to_ov (v);const QemuOpt *opt;if (obj) {
@@ -160,7 +166,7 @@ ghr_true(gpointer ign_key, gpointer ign_value, gpointer ign_user_data)static void opts_end_struct (Visitor *v,Error **errp) { -OptsVisitor *ov =DO_UPCAST (OptsVisitor, visitor, v); +OptsVisitor *ov =to_ov (v);GQueue *any;if (--ov->depth >0 ) {
@@ -202,7 +208,7 @@ lookup_distinct(const OptsVisitor *ov, const char *name, Error **errp)static void opts_start_list (Visitor *v,const char *name,Error **errp) { -OptsVisitor *ov =DO_UPCAST (OptsVisitor, visitor, v); +OptsVisitor *ov =to_ov (v);/* we can't traverse a list in a list */ assert (ov->list_mode ==LM_NONE );
@@ -216,7 +222,7 @@ opts_start_list(Visitor *v, const char *name, Error **errp)static GenericList *opts_next_list (Visitor *v,GenericList **list,Error **errp) { -OptsVisitor *ov =DO_UPCAST (OptsVisitor, visitor, v); +OptsVisitor *ov =to_ov (v);GenericList **link;switch (ov->list_mode) {
@@ -265,7 +271,7 @@ opts_next_list(Visitor *v, GenericList **list, Error **errp)static void opts_end_list (Visitor *v,Error **errp) { -OptsVisitor *ov =DO_UPCAST (OptsVisitor, visitor, v); +OptsVisitor *ov =to_ov (v); assert(ov->list_mode == LM_STARTED || ov->list_mode == LM_IN_PROGRESS ||
@@ -307,7 +313,7 @@ processed(OptsVisitor *ov, const char *name)static void opts_type_str (Visitor *v,char **obj,const char *name,Error **errp) { -OptsVisitor *ov =DO_UPCAST (OptsVisitor, visitor, v); +OptsVisitor *ov =to_ov (v);const QemuOpt *opt; opt =lookup_scalar (ov, name, errp);
@@ -323,7 +329,7 @@ opts_type_str(Visitor *v, char **obj, const char *name, Error **errp)static void opts_type_bool (Visitor *v,bool *obj,const char *name,Error **errp) { -OptsVisitor *ov =DO_UPCAST (OptsVisitor, visitor, v); +OptsVisitor *ov =to_ov (v);const QemuOpt *opt; opt =lookup_scalar (ov, name, errp);
@@ -356,7 +362,7 @@ opts_type_bool(Visitor *v, bool *obj, const char *name, Error **errp)static void opts_type_int (Visitor *v,int64_t *obj,const char *name,Error **errp) { -OptsVisitor *ov =DO_UPCAST (OptsVisitor, visitor, v); +OptsVisitor *ov =to_ov (v);const QemuOpt *opt;const char *str;long long val;
@@ -412,7 +418,7 @@ opts_type_int(Visitor *v, int64_t *obj, const char *name, Error **errp)static void opts_type_uint64 (Visitor *v,uint64_t *obj,const char *name,Error **errp) { -OptsVisitor *ov =DO_UPCAST (OptsVisitor, visitor, v); +OptsVisitor *ov =to_ov (v);const QemuOpt *opt;const char *str;unsigned long long val;
@@ -464,7 +470,7 @@ opts_type_uint64(Visitor *v, uint64_t *obj, const char *name, Error **errp)static void opts_type_size (Visitor *v,uint64_t *obj,const char *name,Error **errp) { -OptsVisitor *ov =DO_UPCAST (OptsVisitor, visitor, v); +OptsVisitor *ov =to_ov (v);const QemuOpt *opt;int64_t val;char *endptr;
@@ -490,7 +496,7 @@ opts_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp)static void opts_optional (Visitor *v,bool *present,const char *name) { -OptsVisitor *ov =DO_UPCAST (OptsVisitor, visitor, v); +OptsVisitor *ov =to_ov (v);/* we only support a single mandatory scalar field in a list node */ assert (ov->list_mode ==LM_NONE );
qapi/string-input-visitor.c +14 -9
@@ -32,6 +32,11 @@ struct StringInputVisitorconst char *string; }; +static StringInputVisitor *to_siv (Visitor *v) +{ +return container_of (v, StringInputVisitor, visitor); +} +static void free_range (void *range,void *dummy) {g_free (range);
@@ -120,7 +125,7 @@ error:static void start_list (Visitor *v,const char *name,Error **errp) { -StringInputVisitor *siv =DO_UPCAST (StringInputVisitor, visitor, v); +StringInputVisitor *siv =to_siv (v);parse_str (siv, errp);
@@ -136,7 +141,7 @@ start_list(Visitor *v, const char *name, Error **errp)static GenericList *next_list (Visitor *v,GenericList **list,Error **errp) { -StringInputVisitor *siv =DO_UPCAST (StringInputVisitor, visitor, v); +StringInputVisitor *siv =to_siv (v);GenericList **link;Range *r;
@@ -175,14 +180,14 @@ next_list(Visitor *v, GenericList **list, Error **errp)static void end_list (Visitor *v,Error **errp) { -StringInputVisitor *siv =DO_UPCAST (StringInputVisitor, visitor, v); +StringInputVisitor *siv =to_siv (v); siv->head = true; }static void parse_type_int (Visitor *v,int64_t *obj,const char *name,Error **errp) { -StringInputVisitor *siv =DO_UPCAST (StringInputVisitor, visitor, v); +StringInputVisitor *siv =to_siv (v);if (!siv->string) { error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
@@ -224,7 +229,7 @@ error:static void parse_type_size (Visitor *v,uint64_t *obj,const char *name,Error **errp) { -StringInputVisitor *siv =DO_UPCAST (StringInputVisitor, visitor, v); +StringInputVisitor *siv =to_siv (v);Error *err =NULL ;uint64_t val;
@@ -246,7 +251,7 @@ static void parse_type_size(Visitor *v, uint64_t *obj, const char *name,static void parse_type_bool (Visitor *v,bool *obj,const char *name,Error **errp) { -StringInputVisitor *siv =DO_UPCAST (StringInputVisitor, visitor, v); +StringInputVisitor *siv =to_siv (v);if (siv->string) { if (!strcasecmp(siv->string, "on") ||
@@ -270,7 +275,7 @@ static void parse_type_bool(Visitor *v, bool *obj, const char *name,static void parse_type_str (Visitor *v,char **obj,const char *name,Error **errp) { -StringInputVisitor *siv =DO_UPCAST (StringInputVisitor, visitor, v); +StringInputVisitor *siv =to_siv (v);if (siv->string) { *obj =g_strdup (siv->string); }else {
@@ -282,7 +287,7 @@ static void parse_type_str(Visitor *v, char **obj, const char *name,static void parse_type_number (Visitor *v,double *obj,const char *name,Error **errp) { -StringInputVisitor *siv =DO_UPCAST (StringInputVisitor, visitor, v); +StringInputVisitor *siv =to_siv (v);char *endp = (char *) siv->string;double val;
@@ -301,7 +306,7 @@ static void parse_type_number(Visitor *v, double *obj, const char *name,static void parse_optional (Visitor *v,bool *present,const char *name) { -StringInputVisitor *siv =DO_UPCAST (StringInputVisitor, visitor, v); +StringInputVisitor *siv =to_siv (v);if (!siv->string) { *present = false;
qapi/string-output-visitor.c +13 -8
@@ -66,6 +66,11 @@ struct StringOutputVisitorGList *ranges; }; +static StringOutputVisitor *to_sov (Visitor *v) +{ +return container_of (v, StringOutputVisitor, visitor); +} +static void string_output_set (StringOutputVisitor *sov,char *string) {if (sov->string) {
@@ -119,7 +124,7 @@ static void format_string(StringOutputVisitor *sov, Range *r, bool next,static void print_type_int (Visitor *v,int64_t *obj,const char *name,Error **errp) { -StringOutputVisitor *sov =DO_UPCAST (StringOutputVisitor, visitor, v); +StringOutputVisitor *sov =to_sov (v);GList *l;switch (sov->list_mode) {
@@ -195,7 +200,7 @@ static void print_type_int(Visitor *v, int64_t *obj, const char *name,static void print_type_size (Visitor *v,uint64_t *obj,const char *name,Error **errp) { -StringOutputVisitor *sov =DO_UPCAST (StringOutputVisitor, visitor, v); +StringOutputVisitor *sov =to_sov (v);static const char suffixes[] = {'B' ,'K' ,'M' ,'G' ,'T' ,'P' ,'E' };uint64_t div, val;char *out;
@@ -226,14 +231,14 @@ static void print_type_size(Visitor *v, uint64_t *obj, const char *name,static void print_type_bool (Visitor *v,bool *obj,const char *name,Error **errp) { -StringOutputVisitor *sov =DO_UPCAST (StringOutputVisitor, visitor, v); +StringOutputVisitor *sov =to_sov (v);string_output_set (sov,g_strdup (*obj ?"true" :"false" )); }static void print_type_str (Visitor *v,char **obj,const char *name,Error **errp) { -StringOutputVisitor *sov =DO_UPCAST (StringOutputVisitor, visitor, v); +StringOutputVisitor *sov =to_sov (v);char *out;if (sov->human) {
@@ -247,14 +252,14 @@ static void print_type_str(Visitor *v, char **obj, const char *name,static void print_type_number (Visitor *v,double *obj,const char *name,Error **errp) { -StringOutputVisitor *sov =DO_UPCAST (StringOutputVisitor, visitor, v); +StringOutputVisitor *sov =to_sov (v);string_output_set (sov,g_strdup_printf ("%f" , *obj)); }static void start_list (Visitor *v,const char *name,Error **errp) { -StringOutputVisitor *sov =DO_UPCAST (StringOutputVisitor, visitor, v); +StringOutputVisitor *sov =to_sov (v);/* we can't traverse a list in a list */ assert (sov->list_mode ==LM_NONE );
@@ -265,7 +270,7 @@ start_list(Visitor *v, const char *name, Error **errp)static GenericList *next_list (Visitor *v,GenericList **list,Error **errp) { -StringOutputVisitor *sov =DO_UPCAST (StringOutputVisitor, visitor, v); +StringOutputVisitor *sov =to_sov (v);GenericList *ret =NULL ;if (*list) {if (sov->head) {
@@ -292,7 +297,7 @@ next_list(Visitor *v, GenericList **list, Error **errp)static void end_list (Visitor *v,Error **errp) { -StringOutputVisitor *sov =DO_UPCAST (StringOutputVisitor, visitor, v); +StringOutputVisitor *sov =to_sov (v); assert(sov->list_mode == LM_STARTED || sov->list_mode == LM_END ||
Signature · 1 line
2.5.0
PATCH v10 3/25 qapi: Drop dead dealloc visitor variable
In reply to Eric BlakeCommit 0b9d8542 added StackEntry.is_list_head, but forgot to delete the now-unused QapiDeallocVisitor.is_list_head.
---
v10: no change
v9: no change
v8: no change
v7: new patch
--- qapi/qapi-dealloc-visitor.c | 1 - 1 file changed, 1 deletion(-)
qapi/qapi-dealloc-visitor.c +0 -1
@@ -28,7 +28,6 @@ struct QapiDeallocVisitor {Visitor visitor; QTAILQ_HEAD(, StackEntry) stack; -bool is_list_head; };static QapiDeallocVisitor *to_qov (Visitor *v)
Signature · 1 line
2.5.0
PATCH v10 4/25 qapi: Dealloc visitor does not need a type_size()
In reply to Eric BlakeThe intent of having the visitor type_size() callback differ from type_uint64() is to allow special handling for sizes; the visitor core gracefully falls back to type_uint64() if there is no need for the distinction. Since the dealloc visitor does nothing for any of the int visits, drop the pointless size handler.
---
v10: new patch, split out from 10/37
--- qapi/qapi-dealloc-visitor.c | 6 ------ 1 file changed, 6 deletions(-)
qapi/qapi-dealloc-visitor.c +0 -6
@@ -158,11 +158,6 @@ static void qapi_dealloc_type_anything(Visitor *v, QObject **obj, } } -static void qapi_dealloc_type_size (Visitor *v,uint64_t *obj,const char *name, -Error **errp) -{ -} - static void qapi_dealloc_type_enum(Visitor *v, int *obj, const char * const strings[], const char *kind, const char *name,
@@ -224,7 +219,6 @@ QapiDeallocVisitor *qapi_dealloc_visitor_new(void) v->visitor.type_str = qapi_dealloc_type_str; v->visitor.type_number = qapi_dealloc_type_number; v->visitor.type_any = qapi_dealloc_type_anything; - v->visitor.type_size = qapi_dealloc_type_size; v->visitor.start_union = qapi_dealloc_start_union;QTAILQ_INIT (&v->stack);
Signature · 1 line
2.5.0
PATCH v10 5/25 qapi: Drop dead parameter in gen_params()
In reply to Eric BlakeCommit 5cdc8831 reworked gen_params() to be simpler, but forgot to clean up a now-unused errp named argument.
No change to generated code.
---
v10: new patch
--- scripts/qapi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/qapi.py +2 -2
@@ -2,7 +2,7 @@ # QAPI helper library # # Copyright IBM, Corp. 2011 -# Copyright (c) 2013-2015 Red Hat Inc. +# Copyright (c) 2013-2016 Red Hat Inc. # # Authors: # Anthony Liguori <[email protected]>
@@ -1649,7 +1649,7 @@ def gen_visit_fields(members, prefix='', need_cast=False, skiperr=False): if (visit_optional(v, &%(prefix)shas_%(c_name)s, "%(name)s")) { ''', prefix=prefix, c_name=c_name(memb.name), - name=memb.name, errp=errparg) + name=memb.name) push_indent() # Ugly: sometimes we need to cast away const
Signature · 1 line
2.5.0
PATCH v10 6/25 hmp: Drop pointless allocation during qapi visit
In reply to Eric BlakeThe qapi visitor contract allows us to visit a virtual structure, where we don't have any corresponding qapi struct. Most such uses pass NULL for @obj; but these two callers were passing a dummy pointer, which then gets allocated to heap memory but then immediately freed without use. Clean this up to suppress unwanted allocation, like we do elsewhere.
---
v10: resplit 4/37 and 5/37 by action rather than file, retain R-b.
v9: no change
v8: no change
v7: place earlier in series, drop attempts to provide a 'kind' string, drop bogus avoidance of qmp_object_del() on error
v6: new patch, split from RFC on v5 7/46
--- hmp.c | 4 +--- vl.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
hmp.c +1 -3
@@ -1656,7 +1656,6 @@ void hmp_object_add(Monitor *mon, const QDict *qdict)QemuOpts *opts;char *type =NULL ;char *id =NULL ; -void *dummy =NULL ;OptsVisitor *ov;QDict *pdict;
@@ -1668,7 +1667,7 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) ov =opts_visitor_new (opts); pdict =qdict_clone_shallow (qdict); -visit_start_struct (opts_get_visitor (ov), &dummy,NULL ,NULL ,0 , &err); +visit_start_struct (opts_get_visitor (ov),NULL ,NULL ,NULL ,0 , &err);if (err) { goto out_clean; }
@@ -1700,7 +1699,6 @@ out_clean:qemu_opts_del (opts);g_free (id);g_free (type); -g_free (dummy); out:hmp_handle_error (mon, &err);
vl.c +1 -3
@@ -2824,7 +2824,6 @@ static int object_create(void *opaque, QemuOpts *opts, Error **errp)Error *err =NULL ;char *type =NULL ;char *id =NULL ; -void *dummy =NULL ;OptsVisitor *ov;QDict *pdict;bool (*type_predicate)(const char *) = opaque;
@@ -2832,7 +2831,7 @@ static int object_create(void *opaque, QemuOpts *opts, Error **errp) ov =opts_visitor_new (opts); pdict =qemu_opts_to_qdict (opts,NULL ); -visit_start_struct (opts_get_visitor (ov), &dummy,NULL ,NULL ,0 , &err); +visit_start_struct (opts_get_visitor (ov),NULL ,NULL ,NULL ,0 , &err);if (err) { goto out; }
@@ -2867,7 +2866,6 @@ out:QDECREF (pdict);g_free (id);g_free (type); -g_free (dummy);if (err) {error_report_err (err);return -1 ;
Signature · 1 line
2.5.0
PATCH v10 7/25 hmp: Cache use of qapi visitor
In reply to Eric BlakeCache the visitor in a local variable instead of repeatedly calling the accessor.
---
v10: resplit 4/37 and 5/37 by action rather than file, retain R-b.
v9: no change
v8: no change
v7: place earlier in series, drop attempts to provide a 'kind' string, drop bogus avoidance of qmp_object_del() on error
v6: new patch, split from RFC on v5 7/46
--- hmp.c | 12 +++++++----- vl.c | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-)
hmp.c +7 -5
@@ -1658,6 +1658,7 @@ void hmp_object_add(Monitor *mon, const QDict *qdict)char *id =NULL ;OptsVisitor *ov;QDict *pdict; +Visitor *v; opts =qemu_opts_from_qdict (qemu_find_opts ("object" ), qdict, &err);if (err) {
@@ -1666,28 +1667,29 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) ov =opts_visitor_new (opts); pdict =qdict_clone_shallow (qdict); + v =opts_get_visitor (ov); -visit_start_struct (opts_get_visitor (ov),NULL ,NULL ,NULL ,0 , &err); +visit_start_struct (v,NULL ,NULL ,NULL ,0 , &err);if (err) { goto out_clean; }qdict_del (pdict,"qom-type" ); -visit_type_str (opts_get_visitor (ov), &type,"qom-type" , &err); +visit_type_str (v, &type,"qom-type" , &err);if (err) { goto out_end; }qdict_del (pdict,"id" ); -visit_type_str (opts_get_visitor (ov), &id,"id" , &err); +visit_type_str (v, &id,"id" , &err);if (err) { goto out_end; } -object_add (type, id, pdict,opts_get_visitor (ov), &err); +object_add (type, id, pdict, v, &err); out_end: -visit_end_struct (opts_get_visitor (ov), &err_end); +visit_end_struct (v, &err_end);if (!err && err_end) {qmp_object_del (id,NULL ); }
vl.c +7 -5
@@ -2827,17 +2827,19 @@ static int object_create(void *opaque, QemuOpts *opts, Error **errp)OptsVisitor *ov;QDict *pdict;bool (*type_predicate)(const char *) = opaque; +Visitor *v; ov =opts_visitor_new (opts); pdict =qemu_opts_to_qdict (opts,NULL ); + v =opts_get_visitor (ov); -visit_start_struct (opts_get_visitor (ov),NULL ,NULL ,NULL ,0 , &err); +visit_start_struct (v,NULL ,NULL ,NULL ,0 , &err);if (err) { goto out; }qdict_del (pdict,"qom-type" ); -visit_type_str (opts_get_visitor (ov), &type,"qom-type" , &err); +visit_type_str (v, &type,"qom-type" , &err);if (err) { goto out; }
@@ -2846,16 +2848,16 @@ static int object_create(void *opaque, QemuOpts *opts, Error **errp) }qdict_del (pdict,"id" ); -visit_type_str (opts_get_visitor (ov), &id,"id" , &err); +visit_type_str (v, &id,"id" , &err);if (err) { goto out; } -object_add (type, id, pdict,opts_get_visitor (ov), &err); +object_add (type, id, pdict, v, &err);if (err) { goto out; } -visit_end_struct (opts_get_visitor (ov), &err); +visit_end_struct (v, &err);if (err) {qmp_object_del (id,NULL ); }
Signature · 1 line
2.5.0
PATCH v10 8/25 vl: Ensure qapi visitor properly ends struct visit
In reply to Eric BlakeGuarantee that visit_end_struct() is called if visit_start_struct() succeeded. This matches the behavior of most other uses of visitors, and is a step towards the possibility of a future patch that adds and enforces some tighter semantics to the visitor interface (namely, cleanup of the visitor would no longer have to mop up as many leftovers from an aborted partial visit).
The change to code here matches the flow of hmp.c:hmp_object_add(); a later patch will then further simplify the cleanup logic of both places by refactoring visit_end_struct() to not require a second local error object.
---
v10: resplit 4/37 and 5/37 by action rather than file, retain R-b.
v9: no change
v8: no change
v7: place earlier in series, drop attempts to provide a 'kind' string, drop bogus avoidance of qmp_object_del() on error
v6: new patch, split from RFC on v5 7/46
--- vl.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
vl.c +8 -6
@@ -2822,6 +2822,7 @@ static bool object_create_delayed(const char *type)static int object_create (void *opaque,QemuOpts *opts,Error **errp) {Error *err =NULL ; +Error *err_end =NULL ;char *type =NULL ;char *id =NULL ;OptsVisitor *ov;
@@ -2844,23 +2845,24 @@ static int object_create(void *opaque, QemuOpts *opts, Error **errp) goto out; }if (!type_predicate (type)) { +visit_end_struct (v,NULL ); goto out; }qdict_del (pdict,"id" );visit_type_str (v, &id,"id" , &err);if (err) { - goto out; + goto out_end; }object_add (type, id, pdict, v, &err); -if (err) { - goto out; - } -visit_end_struct (v, &err); -if (err) { + +out_end: +visit_end_struct (v, &err_end); +if (!err && err_end) {qmp_object_del (id,NULL ); } +error_propagate (&err, err_end); out:opts_visitor_cleanup (ov);
Signature · 1 line
2.5.0
PATCH v10 9/25 balloon: Improve use of qapi visitor
In reply to Eric BlakeRework the control flow of balloon_stats_get_all() to make it easier for a later patch to split visit_end_struct(). Also switch to the uint64 visitor to match the data type.
---
v10: defer out_nested label to later patch, drop Marc-Andre's R-b
v9: no change
v8: no change
v7: place earlier in series
v6: new patch, split from RFC on v5 7/46
--- hw/virtio/virtio-balloon.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
hw/virtio/virtio-balloon.c +5 -3
@@ -130,9 +130,11 @@ static void balloon_stats_get_all(Object *obj, struct Visitor *v,if (err) { goto out_end; } -for (i =0 ; !err && i <VIRTIO_BALLOON_S_NR ; i++) { -visit_type_int64 (v, (int64_t *) &s->stats[i], balloon_stat_names[i], - &err); +for (i =0 ; i <VIRTIO_BALLOON_S_NR ; i++) { +visit_type_uint64 (v, &s->stats[i], balloon_stat_names[i], &err); +if (err) { +break ; + } }error_propagate (errp, err); err =NULL ;
Signature · 1 line
2.5.0
PATCH v10 10/25 qapi: Improve generated event use of qapi visitor
In reply to Eric BlakeAll other successful clients of visit_start_struct() were paired with an unconditional visit_end_struct(); but the generated code for events was relying on qmp_output_visitor_cleanup() to work on an incomplete visit. Alter the code to guarantee that the struct is completed, which will make a future patch to split visit_end_struct() easier to reason about. While at it, drop some assertions and comments that are not present in other uses of the qmp output visitor, and pass NULL rather than "" as the 'kind' parameter (matching most other uses where obj is NULL).
The changes to the generated code look like:
| qov = qmp_output_visitor_new();
|- g_assert(qov);
|-
| v = qmp_output_get_visitor(qov);
|- g_assert(v);
|
|- /* Fake visit, as if all members are under a structure */
|- visit_start_struct(v, NULL, "", "ACPI_DEVICE_OST", 0, &err);
|+ visit_start_struct(v, NULL, NULL, "ACPI_DEVICE_OST", 0, &err);
| if (err) {
| goto out;
| }
| visit_type_ACPIOSTInfo(v, &info, "info", &err);
| if (err) {
|- goto out;
|+ goto out_obj;
| }
|- visit_end_struct(v, &err);
|+out_obj:
|+ visit_end_struct(v, err ? NULL : &err);
| if (err) {
| goto out;
| }
|
| obj = qmp_output_get_qobject(qov);
|- g_assert(obj != NULL);
|+ g_assert(obj);
|
| qdict_put_obj(qmp, "data", obj);
| emit(QAPI_EVENT_ACPI_DEVICE_OST, qmp, &err);
|
|out:
| qmp_output_visitor_cleanup(qov);
| error_propagate(errp, err);Note that the 'goto out_obj' with no intervening code before the label, as well as the construct of 'err ? NULL : &err', are both a bit unusual but also temporary; they get fixed in a later patch that splits visit_end_struct() to drop its errp parameter by moving some checking before the label. But until that time, this was the simplest way to avoid the appearance of passing a possibly-set error to visit_end_struct(), even though actual code inspection shows that visit_end_struct() for a QMP output visitor will never set an error.
---
v10: avoid appearance of &err misuse; enhance commit message
v9: save churn in declaration order for later series on boxed params, drop Marc-Andre's R-b
v8: no change
v7: place earlier in series, adjust handling of 'kind'
v6: new patch
If desired, I can defer the hunk re-ordering the declaration of obj to later in the series where it actually comes in handy.
--- scripts/qapi-event.py | 16 +++++++--------- scripts/qapi.py | 5 +++-- 2 files changed, 10 insertions(+), 11 deletions(-)
scripts/qapi-event.py +7 -9
@@ -2,7 +2,7 @@ # QAPI event generator # # Copyright (c) 2014 Wenchao Xia -# Copyright (c) 2015 Red Hat Inc. +# Copyright (c) 2015-2016 Red Hat Inc. # # Authors: # Wenchao Xia <[email protected]>
@@ -61,25 +61,23 @@ def gen_event_send(name, arg_type): if arg_type and arg_type.members: ret += mcgen(''' qov = qmp_output_visitor_new(); - g_assert(qov); - v = qmp_output_get_visitor(qov); - g_assert(v); - /* Fake visit, as if all members are under a structure */ - visit_start_struct(v, NULL, "", "%(name)s", 0, &err); + visit_start_struct(v, NULL, NULL, "%(name)s", 0, &err); ''', name=name) ret += gen_err_check() - ret += gen_visit_fields(arg_type.members, need_cast=True) + ret += gen_visit_fields(arg_type.members, need_cast=True, + label='out_obj') ret += mcgen(''' - visit_end_struct(v, &err); +out_obj: + visit_end_struct(v, err ? NULL : &err); if (err) { goto out; } obj = qmp_output_get_qobject(qov); - g_assert(obj != NULL); + g_assert(obj); qdict_put_obj(qmp, "data", obj); ''')
scripts/qapi.py +3 -2
@@ -1636,7 +1636,8 @@ def gen_err_check(label='out', skiperr=False): label=label) -def gen_visit_fields(members, prefix='', need_cast=False, skiperr=False): +def gen_visit_fields(members, prefix='', need_cast=False, skiperr=False, + label='out'): ret = '' if skiperr: errparg = 'NULL'
@@ -1664,7 +1665,7 @@ def gen_visit_fields(members, prefix='', need_cast=False, skiperr=False): c_type=memb.type.c_name(), prefix=prefix, cast=cast, c_name=c_name(memb.name), name=memb.name, errp=errparg) - ret += gen_err_check(skiperr=skiperr) + ret += gen_err_check(skiperr=skiperr, label=label) if memb.optional: pop_indent()
Signature · 1 line
2.5.0
Re: [Qemu-devel] [PATCH v10 10/25] qapi: Improve generated event use of qapi visitor
Quoted 24 lines · Eric Blake
All other successful clients of
visit_start_struct()were paired with an unconditionalvisit_end_struct(); but the generated code for events was relying onqmp_output_visitor_cleanup()to work on an incomplete visit. Alter the code to guarantee that the struct is completed, which will make a future patch to splitvisit_end_struct()easier to reason about. While at it, drop some assertions and comments that are not present in other uses of the qmp output visitor, and pass NULL rather than "" as the 'kind' parameter (matching most other uses where obj is NULL).The changes to the generated code look like:
| qov = qmp_output_visitor_new(); |- g_assert(qov); |- | v = qmp_output_get_visitor(qov); |- g_assert(v); | |- /* Fake visit, as if all members are under a structure */ |- visit_start_struct(v, NULL, "", "ACPI_DEVICE_OST", 0, &err); |+ visit_start_struct(v, NULL, NULL, "ACPI_DEVICE_OST", 0, &err); | if (err) { | goto out; | }
Quoted 8 lines
| visit_type_ACPIOSTInfo(v, &info, "info", &err);
| if (err) {
|- goto out;
|+ goto out_obj;
| }
|- visit_end_struct(v, &err);
|+out_obj:
|+ visit_end_struct(v, err ? NULL : &err);Slightly awkward example, because out_obj is pointless in this degenerated case. You could pick one with multiple members (thus multiple goto out_obj), or do pseudo-code hinting at multiple members.
Quoted 35 lines
| if (err) { | goto out; | } | | obj = qmp_output_get_qobject(qov); |- g_assert(obj != NULL); |+ g_assert(obj); | | qdict_put_obj(qmp, "data", obj); | emit(QAPI_EVENT_ACPI_DEVICE_OST, qmp, &err); | |out: | qmp_output_visitor_cleanup(qov); | error_propagate(errp, err);Note that the 'goto
out_obj' with no intervening code before the label, as well as the construct of 'err ? NULL : &err', are both a bit unusual but also temporary; they get fixed in a later patch that splitsvisit_end_struct()to drop its errp parameter by moving some checking before the label. But until that time, this was the simplest way to avoid the appearance of passing a possibly-set error tovisit_end_struct(), even though actual code inspection shows thatvisit_end_struct()for a QMP output visitor will never set an error.Signed-off-by Eric Blake <[email protected]>---
v10: avoid appearance of &err misuse; enhance commit message
v9: save churn in declaration order for later series on boxed params, drop Marc-Andre's R-b
v8: no change
v7: place earlier in series, adjust handling of 'kind'
v6: new patch
Quoted 2 lines
If desired, I can defer the hunk re-ordering the declaration of obj to later in the series where it actually comes in handy.
Patch looks good.
Re: [Qemu-devel] [PATCH v10 10/25] qapi: Improve generated event use of qapi visitor
Quoted 13 lines · Markus Armbruster
Quoted 4 lines
|+ visit_start_struct(v, NULL, NULL, "ACPI_DEVICE_OST", 0, &err); | if (err) { | goto out; | }Quoted 8 lines
| visit_type_ACPIOSTInfo(v, &info, "info", &err); | if (err) { |- goto out; |+ goto out_obj; | } |- visit_end_struct(v, &err); |+out_obj: |+ visit_end_struct(v, err ? NULL : &err);
Quoted 3 lines
Slightly awkward example, because
out_objis pointless in this degenerated case. You could pick one with multiple members (thus multiple gotoout_obj), or do pseudo-code hinting at multiple members.
DEVICE_DELETED, DEVICE_TRAY_MOVED, MEM_UNPLUG_ERROR, NET_RX_FILTER_CHANGED, and SPICE_CONNECTED are nice candidates (two members instead of one). Do you want to take care of redoing any portion of the commit message?
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Re: [Qemu-devel] [PATCH v10 10/25] qapi: Improve generated event use of qapi visitor
Quoted 15 lines · Eric Blake
Quoted 13 lines · Markus Armbruster
Quoted 12 lines
|+ visit_start_struct(v, NULL, NULL, "ACPI_DEVICE_OST", 0, &err); | if (err) { | goto out; | } | visit_type_ACPIOSTInfo(v, &info, "info", &err); | if (err) { |- goto out; |+ goto out_obj; | } |- visit_end_struct(v, &err); |+out_obj: |+ visit_end_struct(v, err ? NULL : &err);
Quoted 8 lines
Quoted 3 lines
Slightly awkward example, because
out_objis pointless in this degenerated case. You could pick one with multiple members (thus multiple gotoout_obj), or do pseudo-code hinting at multiple members.
DEVICE_DELETED,DEVICE_TRAY_MOVED,MEM_UNPLUG_ERROR,NET_RX_FILTER_CHANGED, andSPICE_CONNECTEDare nice candidates (two members instead of one). Do you want to take care of redoing any portion of the commit message?
Can do. Unless something comes along that requires a respin.
PATCH v10 11/25 qapi: Track all failures between visit_start/stop
In reply to Eric BlakeInside the generated code between visit_start_struct() and visit_end_struct(), we were blindly setting the error into the caller's errp parameter. But a future patch to split visit_end_struct() will require that we take action based on whether an error has occurred, which requires us to track all actions through a local err. Rewrite the visits to be more in line with the other generated calls.
Generated code changes look like:
| visit_start_struct(v, (void **)obj, "Abort", name, sizeof(Abort), &err);
|- if (!err) {
|- if (*obj) {
|- visit_type_Abort_fields(v, obj, errp);
|- }
|- visit_end_struct(v, &err);
|+ if (err) {
|+ goto out;
| }
|+ if (!*obj) {
|+ goto out_obj;
|+ }
|+ visit_type_Abort_fields(v, obj, &err);
|+ error_propagate(errp, err);
|+ err = NULL;
|+out_obj:
|+ visit_end_struct(v, &err);
|+out:
| error_propagate(errp, err);
| }---
v10: enhance commit message, move out_obj label and drop R-b
v9: enhance commit message
v8: no change
v7: place earlier in series
v6: based loosely on v5 7/46, but mostly a rewrite to get the last generated code in the same form as all the others, so that the later conversion to split visit_check_struct() will be easier
--- scripts/qapi-visit.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
scripts/qapi-visit.py +12 -6
@@ -2,7 +2,7 @@ # QAPI visitor generator # # Copyright IBM, Corp. 2011 -# Copyright (C) 2014-2015 Red Hat, Inc. +# Copyright (C) 2014-2016 Red Hat, Inc. # # Authors: # Anthony Liguori <[email protected]>
@@ -123,12 +123,18 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error Error *err = NULL; visit_start_struct(v, (void **)obj, "%(name)s", name, sizeof(%(c_name)s), &err); - if (!err) { - if (*obj) { - visit_type_%(c_name)s_fields(v, obj, errp); - } - visit_end_struct(v, &err); + if (err) { + goto out; } + if (!*obj) { + goto out_obj; + } + visit_type_%(c_name)s_fields(v, obj, &err); + error_propagate(errp, err); + err = NULL; +out_obj: + visit_end_struct(v, &err); +out: error_propagate(errp, err); } ''',
Signature · 1 line
2.5.0
PATCH v10 12/25 qapi-visit: Kill unused visit_end_union()
In reply to Eric BlakeThe generated code can call visit_end_union() without having called visit_start_union(). Example:
if (!*obj) {
goto out_obj;
}
visit_type_CpuInfoBase_fields(v, (CpuInfoBase **)obj, &err);
if (err) {
goto out_obj; // if we go from here...
}
if (!visit_start_union(v, !!(*obj)->u.data, &err) || err) {
goto out_obj;
}
switch ((*obj)->arch) {
[...]
}
out_obj:
// ... then *obj is true, and ...
error_propagate(errp, err);
err = NULL;
if (*obj) {
// we end up here
visit_end_union(v, !!(*obj)->u.data, &err);
}
error_propagate(errp, err);Harmless only because no visitor implements end_union(). Clean it up anyway, by deleting the function as useless.
Messed up since we have visit_end_union (commit cee2ded).
Message-Id: <[email protected]>
---
v10: new patch; take Markus' commit message as a starting point (hence his S-o-b), but rewrite the patch and claim ownership
--- include/qapi/visitor.h | 1 - include/qapi/visitor-impl.h | 1 - scripts/qapi-visit.py | 5 ----- qapi/qapi-visit-core.c | 8 +------- 4 files changed, 1 insertion(+), 14 deletions(-)
include/qapi/visitor.h +0 -1
@@ -70,6 +70,5 @@ void visit_type_str(Visitor *v, char **obj, const char *name, Error **errp);void visit_type_number (Visitor *v,double *obj,const char *name,Error **errp);void visit_type_any (Visitor *v,QObject **obj,const char *name,Error **errp);bool visit_start_union (Visitor *v,bool data_present,Error **errp); -void visit_end_union (Visitor *v,bool data_present,Error **errp);#endif
include/qapi/visitor-impl.h +0 -1
@@ -58,7 +58,6 @@ struct Visitor/* visit_type_size() falls back to (*type_uint64)() if type_size is unset */ void (*type_size)(Visitor *v,uint64_t *obj,const char *name,Error **errp);bool (*start_union)(Visitor *v,bool data_present,Error **errp); -void (*end_union)(Visitor *v,bool data_present,Error **errp); }; void input_type_enum(Visitor *v, int *obj, const char * const strings[],
scripts/qapi-visit.py +0 -5
@@ -320,11 +320,6 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error out_obj: error_propagate(errp, err); err = NULL; - if (*obj) { - visit_end_union(v, !!(*obj)->u.data, &err); - } - error_propagate(errp, err); - err = NULL; visit_end_struct(v, &err); out: error_propagate(errp, err);
qapi/qapi-visit-core.c +1 -7
@@ -1,6 +1,7 @@/* * Core Definitions for QAPI Visitor Classes * +* Copyright (C) 2012-2016 Red Hat, Inc. * Copyright IBM, Corp. 2011 * * Authors:
@@ -66,13 +67,6 @@ bool visit_start_union(Visitor *v, bool data_present, Error **errp)return true; } -void visit_end_union (Visitor *v,bool data_present,Error **errp) -{ -if (v->end_union) { - v->end_union (v, data_present, errp); - } -} -bool visit_optional (Visitor *v,bool *present,const char *name) {if (v->optional) {
Signature · 1 line
2.5.0
Re: [Qemu-devel] [PATCH v10 12/25] qapi-visit: Kill unused visit_end_union()
Quoted 26 lines · Eric Blake
The generated code can call
visit_end_union()without having calledvisit_start_union(). Example:if (!*obj) { goto out_obj; } visit_type_CpuInfoBase_fields(v, (CpuInfoBase **)obj, &err); if (err) { goto out_obj; // if we go from here... } if (!visit_start_union(v, !!(*obj)->u.data, &err) || err) { goto out_obj; } switch ((*obj)->arch) { [...] } out_obj: // ... then *obj is true, and ... error_propagate(errp, err); err = NULL; if (*obj) { // we end up here visit_end_union(v, !!(*obj)->u.data, &err); } error_propagate(errp, err);
Quoted 2 lines
Harmless only because no visitor implements
end_union(). Clean it up anyway, by deleting the function as useless.
This creates an asymmetry between this and the other start_*()s. but it's only temporary: start_union() will go away in "qapi: Rework deallocation of partial struct" (not in this series). Okay.
Quoted 10 lines
Messed up since we have
visit_end_union(commit cee2ded).Signed-off-by Markus Armbruster <[email protected]>Message-Id: <[email protected]>
[expand scope of patch to delete rather than repair]Signed-off-by Eric Blake <[email protected]>---
v10: new patch; take Markus' commit message as a starting point (hence his S-o-b), but rewrite the patch and claim ownership
Patch looks good.
PATCH v10 13/25 qapi: Prefer type_int64 over type_int in visitors
In reply to Eric BlakeThe qapi builtin type 'int' is basically shorthand for the type 'int64'. In fact, since no visitor was providing the optional type_int64() callback, visit_type_int64() was just always falling back to type_int(), cementing the equivalence between the types.
However, some visitors are providing a type_uint64() callback. For purposes of code consistency, it is nicer if all visitors use the paired type_int64/type_uint64 names rather than the mismatched type_int/type_uint64. So this patch just renames the signed int callbacks in place, dropping the type_int() callback as redundant, and a later patch will focus on the unsigned int callbacks.
Add some FIXMEs to questionable reuse of errp in code touched by the rename, while at it (the reuse works as long as the callbacks don't modify value when setting an error, but it's not a good example to set) - a later patch will then fix those.
No change in functionality here, although further cleanups are in the pipeline.
---
v10: reword comments for less churn in next patch
v9: improve commit message, hoist in part of 11/35, drop Marc-Andre's R-b
v8: no change
v7: split off of 1/23 and 2/23 for easier-to-read diffs
--- include/qapi/visitor-impl.h | 6 ++++-- qapi/qapi-visit-core.c | 36 ++++++++++++++++++++++-------------- qapi/opts-visitor.c | 4 ++-- qapi/qapi-dealloc-visitor.c | 6 +++--- qapi/qmp-input-visitor.c | 6 +++--- qapi/qmp-output-visitor.c | 6 +++--- qapi/string-input-visitor.c | 6 +++--- qapi/string-output-visitor.c | 6 +++--- 8 files changed, 43 insertions(+), 33 deletions(-)
include/qapi/visitor-impl.h +4 -2
@@ -36,7 +36,10 @@ struct Visitorvoid (*get_next_type)(Visitor *v,QType *type,bool promote_int,const char *name,Error **errp); -void (*type_int)(Visitor *v,int64_t *obj,const char *name,Error **errp); +/* Must be set. */ +void (*type_int64)(Visitor *v,int64_t *obj,const char *name, +Error **errp); +/* Must be set. */ void (*type_bool)(Visitor *v,bool *obj,const char *name,Error **errp);void (*type_str)(Visitor *v,char **obj,const char *name,Error **errp); void (*type_number)(Visitor *v, double *obj, const char *name,
@@ -54,7 +57,6 @@ struct Visitorvoid (*type_int8)(Visitor *v,int8_t *obj,const char *name,Error **errp);void (*type_int16)(Visitor *v,int16_t *obj,const char *name,Error **errp);void (*type_int32)(Visitor *v,int32_t *obj,const char *name,Error **errp); -void (*type_int64)(Visitor *v,int64_t *obj,const char *name,Error **errp);/* visit_type_size() falls back to (*type_uint64)() if type_size is unset */ void (*type_size)(Visitor *v,uint64_t *obj,const char *name,Error **errp);bool (*start_union)(Visitor *v,bool data_present,Error **errp);
qapi/qapi-visit-core.c +22 -14
@@ -91,7 +91,7 @@ void visit_type_enum(Visitor *v, int *obj, const char * const strings[],void visit_type_int (Visitor *v,int64_t *obj,const char *name,Error **errp) { - v->type_int (v, obj, name, errp); + v->type_int64 (v, obj, name, errp); }void visit_type_uint8 (Visitor *v,uint8_t *obj,const char *name,Error **errp)
@@ -102,8 +102,10 @@ void visit_type_uint8(Visitor *v, uint8_t *obj, const char *name, Error **errp) v->type_uint8 (v, obj, name, errp); }else { value = *obj; - v->type_int (v, &value, name, errp); + v->type_int64 (v, &value, name, errp);if (value <0 || value >UINT8_MAX ) { +/* FIXME questionable reuse of errp if callback changed +value on error */ error_setg (errp,QERR_INVALID_PARAMETER_VALUE , name ? name :"null" ,"uint8_t" );return ;
@@ -120,8 +122,10 @@ void visit_type_uint16(Visitor *v, uint16_t *obj, const char *name, Error **errp v->type_uint16 (v, obj, name, errp); }else { value = *obj; - v->type_int (v, &value, name, errp); + v->type_int64 (v, &value, name, errp);if (value <0 || value >UINT16_MAX ) { +/* FIXME questionable reuse of errp if callback changed +value on error */ error_setg (errp,QERR_INVALID_PARAMETER_VALUE , name ? name :"null" ,"uint16_t" );return ;
@@ -138,8 +142,10 @@ void visit_type_uint32(Visitor *v, uint32_t *obj, const char *name, Error **errp v->type_uint32 (v, obj, name, errp); }else { value = *obj; - v->type_int (v, &value, name, errp); + v->type_int64 (v, &value, name, errp);if (value <0 || value >UINT32_MAX ) { +/* FIXME questionable reuse of errp if callback changed +value on error */ error_setg (errp,QERR_INVALID_PARAMETER_VALUE , name ? name :"null" ,"uint32_t" );return ;
@@ -156,7 +162,7 @@ void visit_type_uint64(Visitor *v, uint64_t *obj, const char *name, Error **errp v->type_uint64 (v, obj, name, errp); }else { value = *obj; - v->type_int (v, &value, name, errp); + v->type_int64 (v, &value, name, errp); *obj = value; } }
@@ -169,8 +175,10 @@ void visit_type_int8(Visitor *v, int8_t *obj, const char *name, Error **errp) v->type_int8 (v, obj, name, errp); }else { value = *obj; - v->type_int (v, &value, name, errp); + v->type_int64 (v, &value, name, errp);if (value <INT8_MIN || value >INT8_MAX ) { +/* FIXME questionable reuse of errp if callback changed +value on error */ error_setg (errp,QERR_INVALID_PARAMETER_VALUE , name ? name :"null" ,"int8_t" );return ;
@@ -187,8 +195,10 @@ void visit_type_int16(Visitor *v, int16_t *obj, const char *name, Error **errp) v->type_int16 (v, obj, name, errp); }else { value = *obj; - v->type_int (v, &value, name, errp); + v->type_int64 (v, &value, name, errp);if (value <INT16_MIN || value >INT16_MAX ) { +/* FIXME questionable reuse of errp if callback changed +value on error */ error_setg (errp,QERR_INVALID_PARAMETER_VALUE , name ? name :"null" ,"int16_t" );return ;
@@ -205,8 +215,10 @@ void visit_type_int32(Visitor *v, int32_t *obj, const char *name, Error **errp) v->type_int32 (v, obj, name, errp); }else { value = *obj; - v->type_int (v, &value, name, errp); + v->type_int64 (v, &value, name, errp);if (value <INT32_MIN || value >INT32_MAX ) { +/* FIXME questionable reuse of errp if callback changed +value on error */ error_setg (errp,QERR_INVALID_PARAMETER_VALUE , name ? name :"null" ,"int32_t" );return ;
@@ -217,11 +229,7 @@ void visit_type_int32(Visitor *v, int32_t *obj, const char *name, Error **errp)void visit_type_int64 (Visitor *v,int64_t *obj,const char *name,Error **errp) { -if (v->type_int64) { - v->type_int64 (v, obj, name, errp); - }else { - v->type_int (v, obj, name, errp); - } + v->type_int64 (v, obj, name, errp); }void visit_type_size (Visitor *v,uint64_t *obj,const char *name,Error **errp)
@@ -234,7 +242,7 @@ void visit_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp) v->type_uint64 (v, obj, name, errp); }else { value = *obj; - v->type_int (v, &value, name, errp); + v->type_int64 (v, &value, name, errp); *obj = value; } }
qapi/opts-visitor.c +2 -2
@@ -360,7 +360,7 @@ opts_type_bool(Visitor *v, bool *obj, const char *name, Error **errp)static void -opts_type_int (Visitor *v,int64_t *obj,const char *name,Error **errp) +opts_type_int64 (Visitor *v,int64_t *obj,const char *name,Error **errp) {OptsVisitor *ov =to_ov (v);const QemuOpt *opt;
@@ -528,7 +528,7 @@ opts_visitor_new(const QemuOpts *opts)*/ ov->visitor.type_enum = &input_type_enum; - ov->visitor.type_int = &opts_type_int; + ov->visitor.type_int64 = &opts_type_int64; ov->visitor.type_uint64 = &opts_type_uint64; ov->visitor.type_size = &opts_type_size; ov->visitor.type_bool = &opts_type_bool;
qapi/qapi-dealloc-visitor.c +3 -3
@@ -135,8 +135,8 @@ static void qapi_dealloc_type_str(Visitor *v, char **obj, const char *name, } } -static void qapi_dealloc_type_int (Visitor *v,int64_t *obj,const char *name, -Error **errp) +static void qapi_dealloc_type_int64 (Visitor *v,int64_t *obj,const char *name, +Error **errp) { }
@@ -214,7 +214,7 @@ QapiDeallocVisitor *qapi_dealloc_visitor_new(void) v->visitor.next_list = qapi_dealloc_next_list; v->visitor.end_list = qapi_dealloc_end_list; v->visitor.type_enum = qapi_dealloc_type_enum; - v->visitor.type_int = qapi_dealloc_type_int; + v->visitor.type_int64 = qapi_dealloc_type_int64; v->visitor.type_bool = qapi_dealloc_type_bool; v->visitor.type_str = qapi_dealloc_type_str; v->visitor.type_number = qapi_dealloc_type_number;
qapi/qmp-input-visitor.c +3 -3
@@ -224,8 +224,8 @@ static void qmp_input_get_next_type(Visitor *v, QType *type, bool promote_int, } } -static void qmp_input_type_int (Visitor *v,int64_t *obj,const char *name, -Error **errp) +static void qmp_input_type_int64 (Visitor *v,int64_t *obj,const char *name, +Error **errp) {QmpInputVisitor *qiv =to_qiv (v);QInt *qint =qobject_to_qint (qmp_input_get_object (qiv, name, true));
@@ -341,7 +341,7 @@ QmpInputVisitor *qmp_input_visitor_new(QObject *obj) v->visitor.next_list = qmp_input_next_list; v->visitor.end_list = qmp_input_end_list; v->visitor.type_enum = input_type_enum; - v->visitor.type_int = qmp_input_type_int; + v->visitor.type_int64 = qmp_input_type_int64; v->visitor.type_bool = qmp_input_type_bool; v->visitor.type_str = qmp_input_type_str; v->visitor.type_number = qmp_input_type_number;
qapi/qmp-output-visitor.c +3 -3
@@ -158,8 +158,8 @@ static void qmp_output_end_list(Visitor *v, Error **errp)qmp_output_pop (qov); } -static void qmp_output_type_int (Visitor *v,int64_t *obj,const char *name, -Error **errp) +static void qmp_output_type_int64 (Visitor *v,int64_t *obj,const char *name, +Error **errp) {QmpOutputVisitor *qov =to_qov (v);qmp_output_add (qov, name,qint_from_int (*obj));
@@ -241,7 +241,7 @@ QmpOutputVisitor *qmp_output_visitor_new(void) v->visitor.next_list = qmp_output_next_list; v->visitor.end_list = qmp_output_end_list; v->visitor.type_enum = output_type_enum; - v->visitor.type_int = qmp_output_type_int; + v->visitor.type_int64 = qmp_output_type_int64; v->visitor.type_bool = qmp_output_type_bool; v->visitor.type_str = qmp_output_type_str; v->visitor.type_number = qmp_output_type_number;
qapi/string-input-visitor.c +3 -3
@@ -184,8 +184,8 @@ end_list(Visitor *v, Error **errp) siv->head = true; } -static void parse_type_int (Visitor *v,int64_t *obj,const char *name, -Error **errp) +static void parse_type_int64 (Visitor *v,int64_t *obj,const char *name, +Error **errp) {StringInputVisitor *siv =to_siv (v);
@@ -335,7 +335,7 @@ StringInputVisitor *string_input_visitor_new(const char *str) v =g_malloc0 (sizeof (*v)); v->visitor.type_enum = input_type_enum; - v->visitor.type_int = parse_type_int; + v->visitor.type_int64 = parse_type_int64; v->visitor.type_size = parse_type_size; v->visitor.type_bool = parse_type_bool; v->visitor.type_str = parse_type_str;
qapi/string-output-visitor.c +3 -3
@@ -121,8 +121,8 @@ static void format_string(StringOutputVisitor *sov, Range *r, bool next, } } -static void print_type_int (Visitor *v,int64_t *obj,const char *name, -Error **errp) +static void print_type_int64 (Visitor *v,int64_t *obj,const char *name, +Error **errp) {StringOutputVisitor *sov =to_sov (v);GList *l;
@@ -345,7 +345,7 @@ StringOutputVisitor *string_output_visitor_new(bool human) v->string =g_string_new (NULL ); v->human = human; v->visitor.type_enum = output_type_enum; - v->visitor.type_int = print_type_int; + v->visitor.type_int64 = print_type_int64; v->visitor.type_size = print_type_size; v->visitor.type_bool = print_type_bool; v->visitor.type_str = print_type_str;
Signature · 1 line
2.5.0
PATCH v10 14/25 qapi: Make all visitors supply uint64 callbacks
In reply to Eric BlakeOur qapi visitor contract supports multiple integer visitors, but left the type_uint64 visitor as optional (falling back on type_int64); which in turn can lead to awkward behavior with numbers larger than INT64_MAX (the user has to be aware of twos complement, and deal with negatives).
This patch does not address the disparity in handling large values as negatives. It merely moves the fallback from uint64 to int64 from the visitor core to the visitors, where the issue can actually be fixed, by implementing the missing type_uint64() callbacks on top of the respective type_int64() callbacks, and with a FIXME comment explaining why that's wrong.
With that done, we now have a type_uint64() callback in every driver, so we can make it mandatory from the core. And although the type_int64() callback can cover the entire valid range of type_uint{8,16,32} on valid user input, using type_uint64() to avoid mixed signedness makes more sense.
---
v10: improve commit message, split out dealloc type_size change
v9: hoist in part of 11/35, drop Marc-Andre's R-b
v8: no change
v7: split off int64 callbacks and retitle, add more FIXMEs in the code, hoist use of type_uint64 here from 3/23, improved commit message
v6: new patch, but stems from v5 23/46
--- include/qapi/visitor-impl.h | 9 ++++++--- qapi/qapi-visit-core.c | 36 +++++++++++------------------------- qapi/qapi-dealloc-visitor.c | 6 ++++++ qapi/qmp-input-visitor.c | 17 +++++++++++++++++ qapi/qmp-output-visitor.c | 9 +++++++++ qapi/string-input-visitor.c | 15 +++++++++++++++ qapi/string-output-visitor.c | 9 +++++++++ 7 files changed, 73 insertions(+), 28 deletions(-)
include/qapi/visitor-impl.h +6 -3
@@ -40,6 +40,12 @@ struct Visitorvoid (*type_int64)(Visitor *v,int64_t *obj,const char *name,Error **errp);/* Must be set. */ +void (*type_uint64)(Visitor *v,uint64_t *obj,const char *name, +Error **errp); +/* Optional; fallback is type_uint64(). */ +void (*type_size)(Visitor *v,uint64_t *obj,const char *name, +Error **errp); +/* Must be set. */ void (*type_bool)(Visitor *v,bool *obj,const char *name,Error **errp);void (*type_str)(Visitor *v,char **obj,const char *name,Error **errp); void (*type_number)(Visitor *v, double *obj, const char *name,
@@ -53,12 +59,9 @@ struct Visitorvoid (*type_uint8)(Visitor *v,uint8_t *obj,const char *name,Error **errp);void (*type_uint16)(Visitor *v,uint16_t *obj,const char *name,Error **errp);void (*type_uint32)(Visitor *v,uint32_t *obj,const char *name,Error **errp); -void (*type_uint64)(Visitor *v,uint64_t *obj,const char *name,Error **errp);void (*type_int8)(Visitor *v,int8_t *obj,const char *name,Error **errp);void (*type_int16)(Visitor *v,int16_t *obj,const char *name,Error **errp);void (*type_int32)(Visitor *v,int32_t *obj,const char *name,Error **errp); -/* visit_type_size() falls back to (*type_uint64)() if type_size is unset */ -void (*type_size)(Visitor *v,uint64_t *obj,const char *name,Error **errp);bool (*start_union)(Visitor *v,bool data_present,Error **errp); };
qapi/qapi-visit-core.c +11 -25
@@ -96,14 +96,14 @@ void visit_type_int(Visitor *v, int64_t *obj, const char *name, Error **errp)void visit_type_uint8 (Visitor *v,uint8_t *obj,const char *name,Error **errp) { -int64_t value; +uint64_t value;if (v->type_uint8) { v->type_uint8 (v, obj, name, errp); }else { value = *obj; - v->type_int64 (v, &value, name, errp); -if (value <0 || value >UINT8_MAX ) { + v->type_uint64 (v, &value, name, errp); +if (value >UINT8_MAX ) {/* FIXME questionable reuse of errp if callback changed value on error */ error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
@@ -116,14 +116,14 @@ void visit_type_uint8(Visitor *v, uint8_t *obj, const char *name, Error **errp)void visit_type_uint16 (Visitor *v,uint16_t *obj,const char *name,Error **errp) { -int64_t value; +uint64_t value;if (v->type_uint16) { v->type_uint16 (v, obj, name, errp); }else { value = *obj; - v->type_int64 (v, &value, name, errp); -if (value <0 || value >UINT16_MAX ) { + v->type_uint64 (v, &value, name, errp); +if (value >UINT16_MAX ) {/* FIXME questionable reuse of errp if callback changed value on error */ error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
@@ -136,14 +136,14 @@ void visit_type_uint16(Visitor *v, uint16_t *obj, const char *name, Error **errpvoid visit_type_uint32 (Visitor *v,uint32_t *obj,const char *name,Error **errp) { -int64_t value; +uint64_t value;if (v->type_uint32) { v->type_uint32 (v, obj, name, errp); }else { value = *obj; - v->type_int64 (v, &value, name, errp); -if (value <0 || value >UINT32_MAX ) { + v->type_uint64 (v, &value, name, errp); +if (value >UINT32_MAX ) {/* FIXME questionable reuse of errp if callback changed value on error */ error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
@@ -156,15 +156,7 @@ void visit_type_uint32(Visitor *v, uint32_t *obj, const char *name, Error **errpvoid visit_type_uint64 (Visitor *v,uint64_t *obj,const char *name,Error **errp) { -int64_t value; - -if (v->type_uint64) { - v->type_uint64 (v, obj, name, errp); - }else { - value = *obj; - v->type_int64 (v, &value, name, errp); - *obj = value; - } + v->type_uint64 (v, obj, name, errp); }void visit_type_int8 (Visitor *v,int8_t *obj,const char *name,Error **errp)
@@ -234,16 +226,10 @@ void visit_type_int64(Visitor *v, int64_t *obj, const char *name, Error **errp)void visit_type_size (Visitor *v,uint64_t *obj,const char *name,Error **errp) { -int64_t value; -if (v->type_size) { v->type_size (v, obj, name, errp); - }else if (v->type_uint64) { - v->type_uint64 (v, obj, name, errp); }else { - value = *obj; - v->type_int64 (v, &value, name, errp); - *obj = value; + v->type_uint64 (v, obj, name, errp); } }
qapi/qapi-dealloc-visitor.c +6 -0
@@ -140,6 +140,11 @@ static void qapi_dealloc_type_int64(Visitor *v, int64_t *obj, const char *name, { } +static void qapi_dealloc_type_uint64 (Visitor *v,uint64_t *obj, +const char *name,Error **errp) +{ +} +static void qapi_dealloc_type_bool (Visitor *v,bool *obj,const char *name,Error **errp) {
@@ -215,6 +220,7 @@ QapiDeallocVisitor *qapi_dealloc_visitor_new(void) v->visitor.end_list = qapi_dealloc_end_list; v->visitor.type_enum = qapi_dealloc_type_enum; v->visitor.type_int64 = qapi_dealloc_type_int64; + v->visitor.type_uint64 = qapi_dealloc_type_uint64; v->visitor.type_bool = qapi_dealloc_type_bool; v->visitor.type_str = qapi_dealloc_type_str; v->visitor.type_number = qapi_dealloc_type_number;
qapi/qmp-input-visitor.c +17 -0
@@ -239,6 +239,22 @@ static void qmp_input_type_int64(Visitor *v, int64_t *obj, const char *name, *obj =qint_get_int (qint); } +static void qmp_input_type_uint64 (Visitor *v,uint64_t *obj,const char *name, +Error **errp) +{ +/* FIXME: qobject_to_qint mishandles values over INT64_MAX */ +QmpInputVisitor *qiv =to_qiv (v); +QInt *qint =qobject_to_qint (qmp_input_get_object (qiv, name, true)); + +if (!qint) { +error_setg (errp,QERR_INVALID_PARAMETER_TYPE , name ? name :"null" , +"integer" ); +return ; + } + + *obj =qint_get_int (qint); +} +static void qmp_input_type_bool (Visitor *v,bool *obj,const char *name,Error **errp) {
@@ -342,6 +358,7 @@ QmpInputVisitor *qmp_input_visitor_new(QObject *obj) v->visitor.end_list = qmp_input_end_list; v->visitor.type_enum = input_type_enum; v->visitor.type_int64 = qmp_input_type_int64; + v->visitor.type_uint64 = qmp_input_type_uint64; v->visitor.type_bool = qmp_input_type_bool; v->visitor.type_str = qmp_input_type_str; v->visitor.type_number = qmp_input_type_number;
qapi/qmp-output-visitor.c +9 -0
@@ -165,6 +165,14 @@ static void qmp_output_type_int64(Visitor *v, int64_t *obj, const char *name,qmp_output_add (qov, name,qint_from_int (*obj)); } +static void qmp_output_type_uint64 (Visitor *v,uint64_t *obj,const char *name, +Error **errp) +{ +/* FIXME: QMP outputs values larger than INT64_MAX as negative */ +QmpOutputVisitor *qov =to_qov (v); +qmp_output_add (qov, name,qint_from_int (*obj)); +} +static void qmp_output_type_bool (Visitor *v,bool *obj,const char *name,Error **errp) {
@@ -242,6 +250,7 @@ QmpOutputVisitor *qmp_output_visitor_new(void) v->visitor.end_list = qmp_output_end_list; v->visitor.type_enum = output_type_enum; v->visitor.type_int64 = qmp_output_type_int64; + v->visitor.type_uint64 = qmp_output_type_uint64; v->visitor.type_bool = qmp_output_type_bool; v->visitor.type_str = qmp_output_type_str; v->visitor.type_number = qmp_output_type_number;
qapi/string-input-visitor.c +15 -0
@@ -226,6 +226,20 @@ error: "an int64 value or range"); } +static void parse_type_uint64 (Visitor *v,uint64_t *obj,const char *name, +Error **errp) +{ +/* FIXME: parse_type_int64 mishandles values over INT64_MAX */ +int64_t i; +Error *err =NULL ; +parse_type_int64 (v, &i, name, &err); +if (err) { +error_propagate (errp, err); + }else { + *obj = i; + } +} +static void parse_type_size (Visitor *v,uint64_t *obj,const char *name,Error **errp) {
@@ -336,6 +350,7 @@ StringInputVisitor *string_input_visitor_new(const char *str) v->visitor.type_enum = input_type_enum; v->visitor.type_int64 = parse_type_int64; + v->visitor.type_uint64 = parse_type_uint64; v->visitor.type_size = parse_type_size; v->visitor.type_bool = parse_type_bool; v->visitor.type_str = parse_type_str;
qapi/string-output-visitor.c +9 -0
@@ -197,6 +197,14 @@ static void print_type_int64(Visitor *v, int64_t *obj, const char *name, } } +static void print_type_uint64 (Visitor *v,uint64_t *obj,const char *name, +Error **errp) +{ +/* FIXME: print_type_int64 mishandles values over INT64_MAX */ +int64_t i = *obj; +print_type_int64 (v, &i, name, errp); +} +static void print_type_size (Visitor *v,uint64_t *obj,const char *name,Error **errp) {
@@ -346,6 +354,7 @@ StringOutputVisitor *string_output_visitor_new(bool human) v->human = human; v->visitor.type_enum = output_type_enum; v->visitor.type_int64 = print_type_int64; + v->visitor.type_uint64 = print_type_uint64; v->visitor.type_size = print_type_size; v->visitor.type_bool = print_type_bool; v->visitor.type_str = print_type_str;
Signature · 1 line
2.5.0
PATCH v10 15/25 qapi: Consolidate visitor small integer callbacks
In reply to Eric BlakeCommit 4e27e819 introduced optional visitor callbacks for all sorts of int types, but no visitor has supplied any of the callbacks for sizes less than 64 bits. In other words, the generic implementation based on using type_[u]int64() followed by bounds-checking works just fine. In the interest of simplicity, it's easier to make the visitor callback interface not have to worry about the other sizes.
Adding some helper functions minimizes the boilerplate required to correct FIXMEs added earlier with regards to questionable reuse of errp, particularly now that we can guarantee from a single file audit that value is unchanged if an error is set.
---
v10: tweak copyright line, rebase to earlier changes
v9: hoist some of visitor-impl.h changes into 9/35 and 10/35
v8: no change
v7: further factor out helper functions that eliminate the questionable errp reuse
v6: split off from v5 23/46
original version also appeared in v6-v9 of subset D
--- include/qapi/visitor-impl.h | 8 +-- qapi/qapi-visit-core.c | 158 +++++++++++++++++--------------------------- 2 files changed, 60 insertions(+), 106 deletions(-)
include/qapi/visitor-impl.h +1 -7
@@ -1,7 +1,7 @@/* * Core Definitions for QAPI Visitor implementations * -* Copyright (C) 2012 Red Hat, Inc. +* Copyright (C) 2012-2016 Red Hat, Inc. * * Author: Paolo Bonizni <[email protected]> *
@@ -56,12 +56,6 @@ struct Visitor/* May be NULL; most useful for input visitors. */ void (*optional)(Visitor *v,bool *present,const char *name); -void (*type_uint8)(Visitor *v,uint8_t *obj,const char *name,Error **errp); -void (*type_uint16)(Visitor *v,uint16_t *obj,const char *name,Error **errp); -void (*type_uint32)(Visitor *v,uint32_t *obj,const char *name,Error **errp); -void (*type_int8)(Visitor *v,int8_t *obj,const char *name,Error **errp); -void (*type_int16)(Visitor *v,int16_t *obj,const char *name,Error **errp); -void (*type_int32)(Visitor *v,int32_t *obj,const char *name,Error **errp);bool (*start_union)(Visitor *v,bool data_present,Error **errp); };
qapi/qapi-visit-core.c +59 -99
188 lines not on this page · raw message
Signature · 1 line
2.5.0
PATCH v10 16/25 qapi: Don't cast Enum* to int*
In reply to Eric BlakeC compilers are allowed to represent enums as a smaller type than int, if all enum values fit in the smaller type. There are even compiler flags that force the use of this smaller representation, although using them changes the ABI of a binary. Therefore, our generated code for visit_type_ENUM() (for all qapi enums) was wrong for casting Enum* to int* when calling visit_type_enum().
It appears that no one has been using compiler ABI switches for qemu, because if they had, we are potentially dereferencing beyond bounds or even risking a SIGBUS on platforms where unaligned pointer dereferencing is fatal. But it is still better to avoid the practice entirely, and just use the correct types.
This matches the fix for alternate qapi types, done earlier in commit 0426d53 "qapi: Simplify visiting of alternate types", with generated code changing as:
| void visit_type_QType(Visitor *v, QType *obj, const char *name, Error **errp)
| {
|- visit_type_enum(v, (int *)obj, QType_lookup, "QType", name, errp);
|+ int value = *obj;
|+ visit_type_enum(v, &value, QType_lookup, "QType", name, errp);
|+ *obj = value;
| }---
v10: s/tmp/value/, shorter commit message
v9: mention earlier commit id, enhance commit message
v8: no change
v7: rebase on typo fix
v6: new patch
--- scripts/qapi-visit.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
scripts/qapi-visit.py +3 -2
@@ -178,12 +178,13 @@ out: def gen_visit_enum(name): - # FIXME cast from enum *obj to int * invalidly assumes enum is int return mcgen(''' void visit_type_%(c_name)s(Visitor *v, %(c_name)s *obj, const char *name, Error **errp) { - visit_type_enum(v, (int *)obj, %(c_name)s_lookup, "%(name)s", name, errp); + int value = *obj; + visit_type_enum(v, &value, %(c_name)s_lookup, "%(name)s", name, errp); + *obj = value; } ''', c_name=c_name(name), name=name)
Signature · 1 line
2.5.0
PATCH v10 17/25 qom: Use typedef for Visitor
In reply to Eric BlakeNo need to repeat 'struct Visitor' when we already have it in typedefs.h. Omitting the redundant 'struct' also makes a later patch easier to search for all object property callbacks that are associated with a Visitor.
---
v10: no change
v9: no change
v8: new patch
--- include/qom/object.h | 9 ++++----- hw/misc/edu.c | 4 ++-- hw/virtio/virtio-balloon.c | 6 +++--- qom/object.c | 4 ++-- target-i386/cpu.c | 4 ++-- 5 files changed, 13 insertions(+), 14 deletions(-)
include/qom/object.h +4 -5
@@ -18,10 +18,9 @@#include <stdint.h> #include <stdbool.h> #include "qemu/queue.h" +#include "qemu/typedefs.h" #include "qapi/error.h" -struct Visitor ; -struct TypeImpl ;typedef struct TypeImpl *Type ;
@@ -298,7 +297,7 @@ typedef struct InterfaceInfo InterfaceInfo;* Called when trying to get/set a property. */ typedef void (ObjectPropertyAccessor )(Object *obj, -struct Visitor *v, +Visitor *v,void *opaque,const char *name,Error **errp);
@@ -1025,7 +1024,7 @@ void object_unparent(Object *obj);* * Reads a property from a object. */ -void object_property_get (Object *obj,struct Visitor *v,const char *name, +void object_property_get (Object *obj,Visitor *v,const char *name,Error **errp);/**
@@ -1161,7 +1160,7 @@ void object_property_get_uint16List(Object *obj, const char *name,* * Writes a property to a object. */ -void object_property_set (Object *obj,struct Visitor *v,const char *name, +void object_property_set (Object *obj,Visitor *v,const char *name,Error **errp);/**
hw/misc/edu.c +2 -2
@@ -362,8 +362,8 @@ static void pci_edu_uninit(PCIDevice *pdev)timer_del (&edu->dma_timer); } -static void edu_obj_uint64 (Object *obj,struct Visitor *v,void *opaque, -const char *name,Error **errp) +static void edu_obj_uint64 (Object *obj,Visitor *v,void *opaque, +const char *name,Error **errp) {uint64_t *val = opaque;
hw/virtio/virtio-balloon.c +3 -3
@@ -110,7 +110,7 @@ static void balloon_stats_poll_cb(void *opaque)virtio_notify (vdev, s->svq); } -static void balloon_stats_get_all (Object *obj,struct Visitor *v, +static void balloon_stats_get_all (Object *obj,Visitor *v,void *opaque,const char *name,Error **errp) {Error *err =NULL ;
@@ -148,7 +148,7 @@ out:error_propagate (errp, err); } -static void balloon_stats_get_poll_interval (Object *obj,struct Visitor *v, +static void balloon_stats_get_poll_interval (Object *obj,Visitor *v,void *opaque,const char *name,Error **errp) {
@@ -156,7 +156,7 @@ static void balloon_stats_get_poll_interval(Object *obj, struct Visitor *v,visit_type_int (v, &s->stats_poll_interval, name, errp); } -static void balloon_stats_set_poll_interval (Object *obj,struct Visitor *v, +static void balloon_stats_set_poll_interval (Object *obj,Visitor *v,void *opaque,const char *name,Error **errp) {
qom/object.c +2 -2
@@ -2184,7 +2184,7 @@ typedef struct {char *target_name; } AliasProperty; -static void property_get_alias (Object *obj,struct Visitor *v,void *opaque, +static void property_get_alias (Object *obj,Visitor *v,void *opaque,const char *name,Error **errp) {AliasProperty *prop = opaque;
@@ -2192,7 +2192,7 @@ static void property_get_alias(Object *obj, struct Visitor *v, void *opaque,object_property_get (prop->target_obj, v, prop->target_name, errp); } -static void property_set_alias (Object *obj,struct Visitor *v,void *opaque, +static void property_set_alias (Object *obj,Visitor *v,void *opaque,const char *name,Error **errp) {AliasProperty *prop = opaque;
target-i386/cpu.c +2 -2
@@ -2945,7 +2945,7 @@ typedef struct BitProperty { } BitProperty;static void x86_cpu_get_bit_prop (Object *obj, -struct Visitor *v, +Visitor *v,void *opaque,const char *name,Error **errp)
@@ -2956,7 +2956,7 @@ static void x86_cpu_get_bit_prop(Object *obj, }static void x86_cpu_set_bit_prop (Object *obj, -struct Visitor *v, +Visitor *v,void *opaque,const char *name,Error **errp)
Signature · 1 line
2.5.0
PATCH v10 18/25 qapi: Swap visit_* arguments for consistent 'name' placement
In reply to Eric BlakeJSON uses "name":value, but many of our visitor interfaces were called with visit_type_FOO(v, &value, name, errp). This can be a bit confusing to have to mentally swap the parameter order to match JSON order. It's particularly bad for visit_start_struct(), where the 'name' parameter is smack in the middle of the otherwise-related group of 'obj, kind, size' parameters! It's time to do a global swap of the parameter ordering, so that the 'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h prefers listing 'name' first in json_prop_*(), and I have plans to unify that file with the qapi visitors; listing 'name' first in qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated files do what I want, then by running the following Coccinelle script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'` I then had to apply some touchups (Coccinelle insisted on TAB indentation in visitor.h, and botched the signature of visit_type_enum() by rewriting 'const char *const strings[]' to the syntactically invalid 'const char*const[] strings'). The movement of parameters is sufficient to provoke compiler errors if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)---
v10: commit message improvement, rebase to earlier changes
v9: mention later docs cleanup in commit message, rebase to master
v8: new patch
--- include/qapi/visitor.h | 52 +++++++++++++++---------- scripts/qapi-commands.py | 4 +- scripts/qapi-event.py | 2 +- scripts/qapi-types.py | 2 +- scripts/qapi-visit.py | 28 ++++++------- scripts/qapi.py | 4 +- qapi/qapi-visit-core.c | 54 +++++++++++++------------ backends/hostmem.c | 8 ++-- block/qapi.c | 2 +- blockdev.c | 4 +- bootdevice.c | 4 +- hmp.c | 8 ++-- hw/acpi/core.c | 4 +- hw/acpi/ich9.c | 14 +++---- hw/block/nvme.c | 4 +- hw/core/machine.c | 10 ++--- hw/core/qdev-properties-system.c | 12 +++--- hw/core/qdev-properties.c | 66 +++++++++++++++---------------- hw/core/qdev.c | 2 +- hw/i386/pc.c | 14 +++---- hw/ide/qdev.c | 4 +- hw/intc/xics.c | 8 ++-- hw/isa/lpc_ich9.c | 2 +- hw/mem/pc-dimm.c | 2 +- hw/misc/edu.c | 2 +- hw/misc/tmp105.c | 4 +- hw/net/ne2000-isa.c | 4 +- hw/pci-host/piix.c | 8 ++-- hw/pci-host/q35.c | 10 ++--- hw/ppc/spapr_drc.c | 12 +++--- hw/usb/dev-storage.c | 4 +- hw/virtio/virtio-balloon.c | 12 +++--- memory.c | 8 ++-- net/dump.c | 4 +- net/filter-buffer.c | 4 +- net/net.c | 4 +- numa.c | 6 +-- qemu-img.c | 11 +++--- qom/object.c | 49 ++++++++++++----------- replay/replay-input.c | 4 +- target-i386/cpu.c | 30 +++++++------- target-ppc/translate_init.c | 4 +- tests/test-opts-visitor.c | 6 +-- tests/test-qdev-global-props.c | 4 +- tests/test-qmp-commands.c | 2 +- tests/test-qmp-input-strict.c | 28 ++++++------- tests/test-qmp-input-visitor.c | 80 +++++++++++++++++++------------------- tests/test-qmp-output-visitor.c | 34 ++++++++-------- tests/test-string-input-visitor.c | 34 ++++++++-------- tests/test-string-output-visitor.c | 16 ++++---- tests/test-visitor-serialization.c | 54 ++++++++++++------------- util/qemu-sockets.c | 4 +- vl.c | 4 +- 53 files changed, 387 insertions(+), 373 deletions(-)
include/qapi/visitor.h +31 -21
@@ -27,8 +27,8 @@ typedef struct GenericListstruct GenericList *next; } GenericList; -void visit_start_struct (Visitor *v,void **obj,const char *kind, -const char *name,size_t size,Error **errp); +void visit_start_struct (Visitor *v,const char *name,void **obj, +const char *kind,size_t size,Error **errp);void visit_end_struct (Visitor *v,Error **errp);void visit_start_implicit_struct (Visitor *v,void **obj,size_t size,Error **errp);
@@ -43,7 +43,7 @@ void visit_end_list(Visitor *v, Error **errp);* corresponding visit_type_*() needs calling; for other visitors, * leave *@present unchanged. Return *@present for convenience. */ -bool visit_optional (Visitor *v,bool *present,const char *name); +bool visit_optional (Visitor *v,const char *name,bool *present);/** * Determine the qtype of the item @name in the current object visit.
@@ -51,24 +51,34 @@ bool visit_optional(Visitor *v, bool *present, const char *name);* alternate type; for other visitors, leave *@type unchanged. * If @promote_int, treat integers as QTYPE_FLOAT. */ -void visit_get_next_type (Visitor *v,QType *type,bool promote_int, -const char *name,Error **errp); -void visit_type_enum (Visitor *v,int *obj,const char *const strings[], -const char *kind,const char *name,Error **errp); -void visit_type_int (Visitor *v,int64_t *obj,const char *name,Error **errp); -void visit_type_uint8 (Visitor *v,uint8_t *obj,const char *name,Error **errp); -void visit_type_uint16 (Visitor *v,uint16_t *obj,const char *name,Error **errp); -void visit_type_uint32 (Visitor *v,uint32_t *obj,const char *name,Error **errp); -void visit_type_uint64 (Visitor *v,uint64_t *obj,const char *name,Error **errp); -void visit_type_int8 (Visitor *v,int8_t *obj,const char *name,Error **errp); -void visit_type_int16 (Visitor *v,int16_t *obj,const char *name,Error **errp); -void visit_type_int32 (Visitor *v,int32_t *obj,const char *name,Error **errp); -void visit_type_int64 (Visitor *v,int64_t *obj,const char *name,Error **errp); -void visit_type_size (Visitor *v,uint64_t *obj,const char *name,Error **errp); -void visit_type_bool (Visitor *v,bool *obj,const char *name,Error **errp); -void visit_type_str (Visitor *v,char **obj,const char *name,Error **errp); -void visit_type_number (Visitor *v,double *obj,const char *name,Error **errp); -void visit_type_any (Visitor *v,QObject **obj,const char *name,Error **errp); +void visit_get_next_type (Visitor *v,const char *name,QType *type, +bool promote_int,Error **errp); +void visit_type_enum (Visitor *v,const char *name,int *obj, +const char *const strings[],const char *kind, +Error **errp); +void visit_type_int (Visitor *v,const char *name,int64_t *obj,Error **errp); +void visit_type_uint8 (Visitor *v,const char *name,uint8_t *obj, +Error **errp); +void visit_type_uint16 (Visitor *v,const char *name,uint16_t *obj, +Error **errp); +void visit_type_uint32 (Visitor *v,const char *name,uint32_t *obj, +Error **errp); +void visit_type_uint64 (Visitor *v,const char *name,uint64_t *obj, +Error **errp); +void visit_type_int8 (Visitor *v,const char *name,int8_t *obj,Error **errp); +void visit_type_int16 (Visitor *v,const char *name,int16_t *obj, +Error **errp); +void visit_type_int32 (Visitor *v,const char *name,int32_t *obj, +Error **errp); +void visit_type_int64 (Visitor *v,const char *name,int64_t *obj, +Error **errp); +void visit_type_size (Visitor *v,const char *name,uint64_t *obj, +Error **errp); +void visit_type_bool (Visitor *v,const char *name,bool *obj,Error **errp); +void visit_type_str (Visitor *v,const char *name,char **obj,Error **errp); +void visit_type_number (Visitor *v,const char *name,double *obj, +Error **errp); +void visit_type_any (Visitor *v,const char *name,QObject **obj,Error **errp);bool visit_start_union (Visitor *v,bool data_present,Error **errp);#endif
scripts/qapi-commands.py +2 -2
@@ -131,7 +131,7 @@ static void qmp_marshal_output_%(c_name)s(%(c_type)s ret_in, QObject **ret_out, Visitor *v; v = qmp_output_get_visitor(qov); - visit_type_%(c_name)s(v, &ret_in, "unused", &err); + visit_type_%(c_name)s(v, "unused", &ret_in, &err); if (err) { goto out; }
@@ -142,7 +142,7 @@ out: qmp_output_visitor_cleanup(qov); qdv = qapi_dealloc_visitor_new(); v = qapi_dealloc_get_visitor(qdv); - visit_type_%(c_name)s(v, &ret_in, "unused", NULL); + visit_type_%(c_name)s(v, "unused", &ret_in, NULL); qapi_dealloc_visitor_cleanup(qdv); } ''',
scripts/qapi-event.py +1 -1
@@ -63,7 +63,7 @@ def gen_event_send(name, arg_type): qov = qmp_output_visitor_new(); v = qmp_output_get_visitor(qov); - visit_start_struct(v, NULL, NULL, "%(name)s", 0, &err); + visit_start_struct(v, "%(name)s", NULL, NULL, 0, &err); ''', name=name) ret += gen_err_check()
scripts/qapi-types.py +1 -1
@@ -155,7 +155,7 @@ void qapi_free_%(c_name)s(%(c_name)s *obj) qdv = qapi_dealloc_visitor_new(); v = qapi_dealloc_get_visitor(qdv); - visit_type_%(c_name)s(v, &obj, NULL, NULL); + visit_type_%(c_name)s(v, NULL, &obj, NULL); qapi_dealloc_visitor_cleanup(qdv); } ''',
scripts/qapi-visit.py +14 -14
@@ -29,7 +29,7 @@ def gen_visit_decl(name, scalar=False): if not scalar: c_type += '*' return mcgen(''' -void visit_type_%(c_name)s(Visitor *v, %(c_type)sobj, const char *name, Error **errp); +void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_type)sobj, Error **errp); ''', c_name=c_name(name), c_type=c_type)
@@ -118,11 +118,11 @@ def gen_visit_struct(name, base, members): # call qapi_free_FOO() to avoid a memory leak of the partial FOO. ret += mcgen(''' -void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error **errp) +void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error **errp) { Error *err = NULL; - visit_start_struct(v, (void **)obj, "%(name)s", name, sizeof(%(c_name)s), &err); + visit_start_struct(v, name, (void **)obj, "%(name)s", sizeof(%(c_name)s), &err); if (err) { goto out; }
@@ -150,7 +150,7 @@ def gen_visit_list(name, element_type): # call qapi_free_FOOList() to avoid a memory leak of the partial FOOList. return mcgen(''' -void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error **errp) +void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error **errp) { Error *err = NULL; GenericList *i, **prev;
@@ -164,7 +164,7 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error !err && (i = visit_next_list(v, prev, &err)) != NULL; prev = &i) { %(c_name)s *native_i = (%(c_name)s *)i; - visit_type_%(c_elt_type)s(v, &native_i->value, NULL, &err); + visit_type_%(c_elt_type)s(v, NULL, &native_i->value, &err); } error_propagate(errp, err);
@@ -180,10 +180,10 @@ out: def gen_visit_enum(name): return mcgen(''' -void visit_type_%(c_name)s(Visitor *v, %(c_name)s *obj, const char *name, Error **errp) +void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s *obj, Error **errp) { int value = *obj; - visit_type_enum(v, &value, %(c_name)s_lookup, "%(name)s", name, errp); + visit_type_enum(v, name, &value, %(c_name)s_lookup, "%(name)s", errp); *obj = value; } ''',
@@ -198,7 +198,7 @@ def gen_visit_alternate(name, variants): ret = mcgen(''' -void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error **errp) +void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error **errp) { Error *err = NULL;
@@ -206,7 +206,7 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error if (err) { goto out; } - visit_get_next_type(v, &(*obj)->type, %(promote_int)s, name, &err); + visit_get_next_type(v, name, &(*obj)->type, %(promote_int)s, &err); if (err) { goto out_obj; }
@@ -217,7 +217,7 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error for var in variants.variants: ret += mcgen(''' case %(case)s: - visit_type_%(c_type)s(v, &(*obj)->u.%(c_name)s, name, &err); + visit_type_%(c_type)s(v, name, &(*obj)->u.%(c_name)s, &err); break; ''', case=var.type.alternate_qtype(),
@@ -255,11 +255,11 @@ def gen_visit_union(name, base, variants): ret += mcgen(''' -void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error **errp) +void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error **errp) { Error *err = NULL; - visit_start_struct(v, (void **)obj, "%(name)s", name, sizeof(%(c_name)s), &err); + visit_start_struct(v, name, (void **)obj, "%(name)s", sizeof(%(c_name)s), &err); if (err) { goto out; }
@@ -276,7 +276,7 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error c_name=base.c_name()) else: ret += mcgen(''' - visit_type_%(c_type)s(v, &(*obj)->%(c_name)s, "%(name)s", &err); + visit_type_%(c_type)s(v, "%(name)s", &(*obj)->%(c_name)s, &err); ''', c_type=variants.tag_member.type.c_name(), c_name=c_name(variants.tag_member.name),
@@ -300,7 +300,7 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error var.name)) if simple_union_type: ret += mcgen(''' - visit_type_%(c_type)s(v, &(*obj)->u.%(c_name)s, "data", &err); + visit_type_%(c_type)s(v, "data", &(*obj)->u.%(c_name)s, &err); ''', c_type=simple_union_type.c_name(), c_name=c_name(var.name))
scripts/qapi.py +2 -2
@@ -1647,7 +1647,7 @@ def gen_visit_fields(members, prefix='', need_cast=False, skiperr=False, for memb in members: if memb.optional: ret += mcgen(''' - if (visit_optional(v, &%(prefix)shas_%(c_name)s, "%(name)s")) { + if (visit_optional(v, "%(name)s", &%(prefix)shas_%(c_name)s)) { ''', prefix=prefix, c_name=c_name(memb.name), name=memb.name)
@@ -1660,7 +1660,7 @@ def gen_visit_fields(members, prefix='', need_cast=False, skiperr=False, cast = '' ret += mcgen(''' - visit_type_%(c_type)s(v, %(cast)s&%(prefix)s%(c_name)s, "%(name)s", %(errp)s); + visit_type_%(c_type)s(v, "%(name)s", %(cast)s&%(prefix)s%(c_name)s, %(errp)s); ''', c_type=memb.type.c_name(), prefix=prefix, cast=cast, c_name=c_name(memb.name), name=memb.name,
qapi/qapi-visit-core.c +30 -24
164 lines not on this page · raw message
backends/hostmem.c +4 -4
@@ -32,7 +32,7 @@ host_memory_backend_get_size(Object *obj, Visitor *v, void *opaque,HostMemoryBackend *backend =MEMORY_BACKEND (obj);uint64_t value = backend->size; -visit_type_size (v, &value, name, errp); +visit_type_size (v, name, &value, errp); } static void
@@ -48,7 +48,7 @@ host_memory_backend_set_size(Object *obj, Visitor *v, void *opaque, goto out; } -visit_type_size (v, &value, name, &local_err); +visit_type_size (v, name, &value, &local_err);if (local_err) { goto out; }
@@ -91,7 +91,7 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, void *opaque, node = &(*node)->next; }while (true); -visit_type_uint16List (v, &host_nodes, name, errp); +visit_type_uint16List (v, name, &host_nodes, errp); } static void
@@ -102,7 +102,7 @@ host_memory_backend_set_host_nodes(Object *obj, Visitor *v, void *opaque,HostMemoryBackend *backend =MEMORY_BACKEND (obj);uint16List *l =NULL ; -visit_type_uint16List (v, &l, name, errp); +visit_type_uint16List (v, name, &l, errp);while (l) {bitmap_set (backend->host_nodes, l->value,1 );
block/qapi.c +1 -1
@@ -636,7 +636,7 @@ void bdrv_image_info_specific_dump(fprintf_function func_fprintf, void *f,QmpOutputVisitor *ov =qmp_output_visitor_new ();QObject *obj, *data; -visit_type_ImageInfoSpecific (qmp_output_get_visitor (ov), &info_spec,NULL , +visit_type_ImageInfoSpecific (qmp_output_get_visitor (ov),NULL , &info_spec, &error_abort); obj =qmp_output_get_qobject (ov);assert (qobject_type (obj) ==QTYPE_QDICT );
blockdev.c +2 -2
@@ -3817,8 +3817,8 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp) } } -visit_type_BlockdevOptions (qmp_output_get_visitor (ov), - &options,NULL , &local_err); +visit_type_BlockdevOptions (qmp_output_get_visitor (ov),NULL , &options, + &local_err);if (local_err) {error_propagate (errp, local_err); goto fail;
bootdevice.c +2 -2
@@ -274,7 +274,7 @@ static void device_get_bootindex(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { BootIndexProperty *prop = opaque; -visit_type_int32 (v, prop->bootindex, name, errp); +visit_type_int32 (v, name, prop->bootindex, errp); } static void device_set_bootindex(Object *obj, Visitor *v, void *opaque,
@@ -284,7 +284,7 @@ static void device_set_bootindex(Object *obj, Visitor *v, void *opaque,int32_t boot_index;Error *local_err =NULL ; -visit_type_int32 (v, &boot_index, name, &local_err); +visit_type_int32 (v, name, &boot_index, &local_err);if (local_err) { goto out; }
hmp.c +4 -4
@@ -1675,13 +1675,13 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) }qdict_del (pdict,"qom-type" ); -visit_type_str (v, &type,"qom-type" , &err); +visit_type_str (v,"qom-type" , &type, &err);if (err) { goto out_end; }qdict_del (pdict,"id" ); -visit_type_str (v, &id,"id" , &err); +visit_type_str (v,"id" , &id, &err);if (err) { goto out_end; }
@@ -1949,8 +1949,8 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)while (m) { ov =string_output_visitor_new (false); -visit_type_uint16List (string_output_get_visitor (ov), - &m->value->host_nodes,NULL ,NULL ); +visit_type_uint16List (string_output_get_visitor (ov),NULL , + &m->value->host_nodes,NULL );monitor_printf (mon,"memory backend: %d\n" , i);monitor_printf (mon," size: %" PRId64"\n" , m->value->size); monitor_printf(mon, " merge: %s\n",
hw/acpi/core.c +2 -2
@@ -242,7 +242,7 @@ void acpi_table_add(const QemuOpts *opts, Error **errp)OptsVisitor *ov; ov =opts_visitor_new (opts); -visit_type_AcpiTableOptions (opts_get_visitor (ov), &hdrs,NULL , &err); +visit_type_AcpiTableOptions (opts_get_visitor (ov),NULL , &hdrs, &err);opts_visitor_cleanup (ov); }
@@ -301,7 +301,7 @@ out:QapiDeallocVisitor *dv; dv =qapi_dealloc_visitor_new (); -visit_type_AcpiTableOptions (qapi_dealloc_get_visitor (dv), &hdrs,NULL , +visit_type_AcpiTableOptions (qapi_dealloc_get_visitor (dv),NULL , &hdrs,NULL );qapi_dealloc_visitor_cleanup (dv); }
hw/acpi/ich9.c +7 -7
@@ -289,7 +289,7 @@ static void ich9_pm_get_gpe0_blk(Object *obj, Visitor *v,ICH9LPCPMRegs *pm = opaque;uint32_t value = pm->pm_io_base +ICH9_PMIO_GPE0_STS ; -visit_type_uint32 (v, &value, name, errp); +visit_type_uint32 (v, name, &value, errp); }static bool ich9_pm_get_memory_hotplug_support (Object *obj,Error **errp)
@@ -314,7 +314,7 @@ static void ich9_pm_get_disable_s3(Object *obj, Visitor *v,ICH9LPCPMRegs *pm = opaque;uint8_t value = pm->disable_s3; -visit_type_uint8 (v, &value, name, errp); +visit_type_uint8 (v, name, &value, errp); } static void ich9_pm_set_disable_s3(Object *obj, Visitor *v,
@@ -325,7 +325,7 @@ static void ich9_pm_set_disable_s3(Object *obj, Visitor *v,Error *local_err =NULL ;uint8_t value; -visit_type_uint8 (v, &value, name, &local_err); +visit_type_uint8 (v, name, &value, &local_err);if (local_err) { goto out; }
@@ -341,7 +341,7 @@ static void ich9_pm_get_disable_s4(Object *obj, Visitor *v,ICH9LPCPMRegs *pm = opaque;uint8_t value = pm->disable_s4; -visit_type_uint8 (v, &value, name, errp); +visit_type_uint8 (v, name, &value, errp); } static void ich9_pm_set_disable_s4(Object *obj, Visitor *v,
@@ -352,7 +352,7 @@ static void ich9_pm_set_disable_s4(Object *obj, Visitor *v,Error *local_err =NULL ;uint8_t value; -visit_type_uint8 (v, &value, name, &local_err); +visit_type_uint8 (v, name, &value, &local_err);if (local_err) { goto out; }
@@ -368,7 +368,7 @@ static void ich9_pm_get_s4_val(Object *obj, Visitor *v,ICH9LPCPMRegs *pm = opaque;uint8_t value = pm->s4_val; -visit_type_uint8 (v, &value, name, errp); +visit_type_uint8 (v, name, &value, errp); } static void ich9_pm_set_s4_val(Object *obj, Visitor *v,
@@ -379,7 +379,7 @@ static void ich9_pm_set_s4_val(Object *obj, Visitor *v,Error *local_err =NULL ;uint8_t value; -visit_type_uint8 (v, &value, name, &local_err); +visit_type_uint8 (v, name, &value, &local_err);if (local_err) { goto out; }
hw/block/nvme.c +2 -2
@@ -921,7 +921,7 @@ static void nvme_get_bootindex(Object *obj, Visitor *v, void *opaque, {NvmeCtrl *s =NVME (obj); -visit_type_int32 (v, &s->conf.bootindex, name, errp); +visit_type_int32 (v, name, &s->conf.bootindex, errp); } static void nvme_set_bootindex(Object *obj, Visitor *v, void *opaque,
@@ -931,7 +931,7 @@ static void nvme_set_bootindex(Object *obj, Visitor *v, void *opaque,int32_t boot_index;Error *local_err =NULL ; -visit_type_int32 (v, &boot_index, name, &local_err); +visit_type_int32 (v, name, &boot_index, &local_err);if (local_err) { goto out; }
hw/core/machine.c +5 -5
@@ -40,7 +40,7 @@ static void machine_set_kernel_irqchip(Object *obj, Visitor *v,MachineState *ms =MACHINE (obj);OnOffSplit mode; -visit_type_OnOffSplit (v, &mode, name, &err); +visit_type_OnOffSplit (v, name, &mode, &err);if (err) {error_propagate (errp, err);return ;
@@ -74,7 +74,7 @@ static void machine_get_kvm_shadow_mem(Object *obj, Visitor *v,MachineState *ms =MACHINE (obj);int64_t value = ms->kvm_shadow_mem; -visit_type_int (v, &value, name, errp); +visit_type_int (v, name, &value, errp); } static void machine_set_kvm_shadow_mem(Object *obj, Visitor *v,
@@ -85,7 +85,7 @@ static void machine_set_kvm_shadow_mem(Object *obj, Visitor *v,Error *error =NULL ;int64_t value; -visit_type_int (v, &value, name, &error); +visit_type_int (v, name, &value, &error);if (error) {error_propagate (errp, error);return ;
@@ -176,7 +176,7 @@ static void machine_get_phandle_start(Object *obj, Visitor *v,MachineState *ms =MACHINE (obj);int64_t value = ms->phandle_start; -visit_type_int (v, &value, name, errp); +visit_type_int (v, name, &value, errp); } static void machine_set_phandle_start(Object *obj, Visitor *v,
@@ -187,7 +187,7 @@ static void machine_set_phandle_start(Object *obj, Visitor *v,Error *error =NULL ;int64_t value; -visit_type_int (v, &value, name, &error); +visit_type_int (v, name, &value, &error);if (error) {error_propagate (errp, error);return ;
hw/core/qdev-properties-system.c +6 -6
@@ -30,7 +30,7 @@ static void get_pointer(Object *obj, Visitor *v, Property *prop,char *p; p = *ptr ?g_strdup ("" ); -visit_type_str (v, &p, name, errp); +visit_type_str (v, name, &p, errp);g_free (p); }
@@ -50,7 +50,7 @@ static void set_pointer(Object *obj, Visitor *v, Property *prop,return ; } -visit_type_str (v, &str, name, &local_err); +visit_type_str (v, name, &str, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -201,7 +201,7 @@ static void get_netdev(Object *obj, Visitor *v, void *opaque,NICPeers *peers_ptr =qdev_get_prop_ptr (dev, prop);char *p =g_strdup (peers_ptr->ncs[0 ] ? peers_ptr->ncs[0 ]->name :"" ); -visit_type_str (v, &p, name, errp); +visit_type_str (v, name, &p, errp);g_free (p); }
@@ -222,7 +222,7 @@ static void set_netdev(Object *obj, Visitor *v, void *opaque,return ; } -visit_type_str (v, &str, name, &local_err); +visit_type_str (v, name, &str, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -307,7 +307,7 @@ static void get_vlan(Object *obj, Visitor *v, void *opaque, } } -visit_type_int32 (v, &id, name, errp); +visit_type_int32 (v, name, &id, errp); } static void set_vlan(Object *obj, Visitor *v, void *opaque,
@@ -326,7 +326,7 @@ static void set_vlan(Object *obj, Visitor *v, void *opaque,return ; } -visit_type_int32 (v, &id, name, &local_err); +visit_type_int32 (v, name, &id, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
hw/core/qdev-properties.c +33 -33
244 lines not on this page · raw message
hw/core/qdev.c +1 -1
@@ -903,7 +903,7 @@ static void qdev_get_legacy_property(Object *obj, Visitor *v, void *opaque,char *ptr = buffer; prop->info->sizeof (buffer)); -visit_type_str (v, &ptr, name, errp); +visit_type_str (v, name, &ptr, errp); }/**
hw/i386/pc.c +7 -7
@@ -1761,7 +1761,7 @@ pc_machine_get_hotplug_memory_region_size(Object *obj, Visitor *v, void *opaque,PCMachineState *pcms =PC_MACHINE (obj);int64_t value =memory_region_size (&pcms->hotplug_memory.mr); -visit_type_int (v, &value, name, errp); +visit_type_int (v, name, &value, errp); } static void pc_machine_get_max_ram_below_4g(Object *obj, Visitor *v,
@@ -1771,7 +1771,7 @@ static void pc_machine_get_max_ram_below_4g(Object *obj, Visitor *v,PCMachineState *pcms =PC_MACHINE (obj);uint64_t value = pcms->max_ram_below_4g; -visit_type_size (v, &value, name, errp); +visit_type_size (v, name, &value, errp); } static void pc_machine_set_max_ram_below_4g(Object *obj, Visitor *v,
@@ -1782,7 +1782,7 @@ static void pc_machine_set_max_ram_below_4g(Object *obj, Visitor *v,Error *error =NULL ;uint64_t value; -visit_type_size (v, &value, name, &error); +visit_type_size (v, name, &value, &error);if (error) {error_propagate (errp, error);return ;
@@ -1810,7 +1810,7 @@ static void pc_machine_get_vmport(Object *obj, Visitor *v, void *opaque,PCMachineState *pcms =PC_MACHINE (obj);OnOffAuto vmport = pcms->vmport; -visit_type_OnOffAuto (v, &vmport, name, errp); +visit_type_OnOffAuto (v, name, &vmport, errp); } static void pc_machine_set_vmport(Object *obj, Visitor *v, void *opaque,
@@ -1818,7 +1818,7 @@ static void pc_machine_set_vmport(Object *obj, Visitor *v, void *opaque, {PCMachineState *pcms =PC_MACHINE (obj); -visit_type_OnOffAuto (v, &pcms->vmport, name, errp); +visit_type_OnOffAuto (v, name, &pcms->vmport, errp); }bool pc_machine_is_smm_enabled (PCMachineState *pcms)
@@ -1852,7 +1852,7 @@ static void pc_machine_get_smm(Object *obj, Visitor *v, void *opaque,PCMachineState *pcms =PC_MACHINE (obj);OnOffAuto smm = pcms->smm; -visit_type_OnOffAuto (v, &smm, name, errp); +visit_type_OnOffAuto (v, name, &smm, errp); } static void pc_machine_set_smm(Object *obj, Visitor *v, void *opaque,
@@ -1860,7 +1860,7 @@ static void pc_machine_set_smm(Object *obj, Visitor *v, void *opaque, {PCMachineState *pcms =PC_MACHINE (obj); -visit_type_OnOffAuto (v, &pcms->smm, name, errp); +visit_type_OnOffAuto (v, name, &pcms->smm, errp); }static bool pc_machine_get_nvdimm (Object *obj,Error **errp)
hw/ide/qdev.c +2 -2
@@ -204,7 +204,7 @@ static void ide_dev_get_bootindex(Object *obj, Visitor *v, void *opaque, {IDEDevice *d =IDE_DEVICE (obj); -visit_type_int32 (v, &d->conf.bootindex, name, errp); +visit_type_int32 (v, name, &d->conf.bootindex, errp); } static void ide_dev_set_bootindex(Object *obj, Visitor *v, void *opaque,
@@ -214,7 +214,7 @@ static void ide_dev_set_bootindex(Object *obj, Visitor *v, void *opaque,int32_t boot_index;Error *local_err =NULL ; -visit_type_int32 (v, &boot_index, name, &local_err); +visit_type_int32 (v, name, &boot_index, &local_err);if (local_err) { goto out; }
hw/intc/xics.c +4 -4
@@ -94,7 +94,7 @@ static void xics_prop_get_nr_irqs(Object *obj, Visitor *v,XICSState *icp =XICS_COMMON (obj);int64_t value = icp->nr_irqs; -visit_type_int (v, &value, name, errp); +visit_type_int (v, name, &value, errp); } static void xics_prop_set_nr_irqs(Object *obj, Visitor *v,
@@ -105,7 +105,7 @@ static void xics_prop_set_nr_irqs(Object *obj, Visitor *v,Error *error =NULL ;int64_t value; -visit_type_int (v, &value, name, &error); +visit_type_int (v, name, &value, &error);if (error) {error_propagate (errp, error);return ;
@@ -128,7 +128,7 @@ static void xics_prop_get_nr_servers(Object *obj, Visitor *v,XICSState *icp =XICS_COMMON (obj);int64_t value = icp->nr_servers; -visit_type_int (v, &value, name, errp); +visit_type_int (v, name, &value, errp); } static void xics_prop_set_nr_servers(Object *obj, Visitor *v,
@@ -140,7 +140,7 @@ static void xics_prop_set_nr_servers(Object *obj, Visitor *v,Error *error =NULL ;int64_t value; -visit_type_int (v, &value, name, &error); +visit_type_int (v, name, &value, &error);if (error) {error_propagate (errp, error);return ;
hw/isa/lpc_ich9.c +1 -1
@@ -576,7 +576,7 @@ static void ich9_lpc_get_sci_int(Object *obj, Visitor *v,ICH9LPCState *lpc =ICH9_LPC_DEVICE (obj);uint32_t value =ich9_lpc_sci_irq (lpc); -visit_type_uint32 (v, &value, name, errp); +visit_type_uint32 (v, name, &value, errp); }static void ich9_lpc_add_properties (ICH9LPCState *lpc)
hw/mem/pc-dimm.c +1 -1
@@ -382,7 +382,7 @@ static void pc_dimm_get_size(Object *obj, Visitor *v, void *opaque, mr =host_memory_backend_get_memory (dimm->hostmem, errp); value =memory_region_size (mr); -visit_type_int (v, &value, name, errp); +visit_type_int (v, name, &value, errp); } static void pc_dimm_check_memdev_is_busy(Object *obj, const char *name,
hw/misc/edu.c +1 -1
@@ -367,7 +367,7 @@ static void edu_obj_uint64(Object *obj, Visitor *v, void *opaque, {uint64_t *val = opaque; -visit_type_uint64 (v, val, name, errp); +visit_type_uint64 (v, name, val, errp); }static void edu_instance_init (Object *obj)
hw/misc/tmp105.c +2 -2
@@ -58,7 +58,7 @@ static void tmp105_get_temperature(Object *obj, Visitor *v, void *opaque,TMP105State *s =TMP105 (obj);int64_t value = s->temperature *1000 /256 ; -visit_type_int (v, &value, name, errp); +visit_type_int (v, name, &value, errp); }/* Units are 0.001 centigrades relative to 0 C. s->temperature is 8.8
@@ -71,7 +71,7 @@ static void tmp105_set_temperature(Object *obj, Visitor *v, void *opaque,Error *local_err =NULL ;int64_t temp; -visit_type_int (v, &temp, name, &local_err); +visit_type_int (v, name, &temp, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
hw/net/ne2000-isa.c +2 -2
@@ -99,7 +99,7 @@ static void isa_ne2000_get_bootindex(Object *obj, Visitor *v, void *opaque,ISANE2000State *isa =ISA_NE2000 (obj);NE2000State *s = &isa->ne2000; -visit_type_int32 (v, &s->c.bootindex, name, errp); +visit_type_int32 (v, name, &s->c.bootindex, errp); } static void isa_ne2000_set_bootindex(Object *obj, Visitor *v, void *opaque,
@@ -110,7 +110,7 @@ static void isa_ne2000_set_bootindex(Object *obj, Visitor *v, void *opaque,int32_t boot_index;Error *local_err =NULL ; -visit_type_int32 (v, &boot_index, name, &local_err); +visit_type_int32 (v, name, &boot_index, &local_err);if (local_err) { goto out; }
hw/pci-host/piix.c +4 -4
@@ -221,7 +221,7 @@ static void i440fx_pcihost_get_pci_hole_start(Object *obj, Visitor *v,I440FXState *s =I440FX_PCI_HOST_BRIDGE (obj);uint32_t value = s->pci_info.w32.begin; -visit_type_uint32 (v, &value, name, errp); +visit_type_uint32 (v, name, &value, errp); } static void i440fx_pcihost_get_pci_hole_end(Object *obj, Visitor *v,
@@ -231,7 +231,7 @@ static void i440fx_pcihost_get_pci_hole_end(Object *obj, Visitor *v,I440FXState *s =I440FX_PCI_HOST_BRIDGE (obj);uint32_t value = s->pci_info.w32.end; -visit_type_uint32 (v, &value, name, errp); +visit_type_uint32 (v, name, &value, errp); } static void i440fx_pcihost_get_pci_hole64_start(Object *obj, Visitor *v,
@@ -243,7 +243,7 @@ static void i440fx_pcihost_get_pci_hole64_start(Object *obj, Visitor *v,pci_bus_get_w64_range (h->bus, &w64); -visit_type_uint64 (v, &w64.begin, name, errp); +visit_type_uint64 (v, name, &w64.begin, errp); } static void i440fx_pcihost_get_pci_hole64_end(Object *obj, Visitor *v,
@@ -255,7 +255,7 @@ static void i440fx_pcihost_get_pci_hole64_end(Object *obj, Visitor *v,pci_bus_get_w64_range (h->bus, &w64); -visit_type_uint64 (v, &w64.end, name, errp); +visit_type_uint64 (v, name, &w64.end, errp); }static void i440fx_pcihost_initfn (Object *obj)
hw/pci-host/q35.c +5 -5
@@ -73,7 +73,7 @@ static void q35_host_get_pci_hole_start(Object *obj, Visitor *v,Q35PCIHost *s =Q35_HOST_DEVICE (obj);uint32_t value = s->mch.pci_info.w32.begin; -visit_type_uint32 (v, &value, name, errp); +visit_type_uint32 (v, name, &value, errp); } static void q35_host_get_pci_hole_end(Object *obj, Visitor *v,
@@ -83,7 +83,7 @@ static void q35_host_get_pci_hole_end(Object *obj, Visitor *v,Q35PCIHost *s =Q35_HOST_DEVICE (obj);uint32_t value = s->mch.pci_info.w32.end; -visit_type_uint32 (v, &value, name, errp); +visit_type_uint32 (v, name, &value, errp); } static void q35_host_get_pci_hole64_start(Object *obj, Visitor *v,
@@ -95,7 +95,7 @@ static void q35_host_get_pci_hole64_start(Object *obj, Visitor *v,pci_bus_get_w64_range (h->bus, &w64); -visit_type_uint64 (v, &w64.begin, name, errp); +visit_type_uint64 (v, name, &w64.begin, errp); } static void q35_host_get_pci_hole64_end(Object *obj, Visitor *v,
@@ -107,7 +107,7 @@ static void q35_host_get_pci_hole64_end(Object *obj, Visitor *v,pci_bus_get_w64_range (h->bus, &w64); -visit_type_uint64 (v, &w64.end, name, errp); +visit_type_uint64 (v, name, &w64.end, errp); } static void q35_host_get_mmcfg_size(Object *obj, Visitor *v,
@@ -117,7 +117,7 @@ static void q35_host_get_mmcfg_size(Object *obj, Visitor *v,PCIExpressHost *e =PCIE_HOST_BRIDGE (obj);uint32_t value = e->size; -visit_type_uint32 (v, &value, name, errp); +visit_type_uint32 (v, name, &value, errp); }static Property mch_props[] = {
hw/ppc/spapr_drc.c +6 -6
@@ -220,7 +220,7 @@ static void prop_get_index(Object *obj, Visitor *v, void *opaque,sPAPRDRConnector *drc =SPAPR_DR_CONNECTOR (obj);sPAPRDRConnectorClass *drck =SPAPR_DR_CONNECTOR_GET_CLASS (drc);uint32_t value = (uint32_t )drck->get_index (drc); -visit_type_uint32 (v, &value, name, errp); +visit_type_uint32 (v, name, &value, errp); } static void prop_get_type(Object *obj, Visitor *v, void *opaque,
@@ -229,7 +229,7 @@ static void prop_get_type(Object *obj, Visitor *v, void *opaque,sPAPRDRConnector *drc =SPAPR_DR_CONNECTOR (obj);sPAPRDRConnectorClass *drck =SPAPR_DR_CONNECTOR_GET_CLASS (drc);uint32_t value = (uint32_t )drck->get_type (drc); -visit_type_uint32 (v, &value, name, errp); +visit_type_uint32 (v, name, &value, errp); }static char *prop_get_name (Object *obj,Error **errp)
@@ -247,7 +247,7 @@ static void prop_get_entity_sense(Object *obj, Visitor *v, void *opaque,uint32_t value; drck->entity_sense (drc, &value); -visit_type_uint32 (v, &value, name, errp); +visit_type_uint32 (v, name, &value, errp); } static void prop_get_fdt(Object *obj, Visitor *v, void *opaque,
@@ -259,7 +259,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, void *opaque,void *fdt;if (!drc->fdt) { -visit_start_struct (v,NULL ,NULL , name,0 , &err); +visit_start_struct (v, name,NULL ,NULL ,0 , &err);if (!err) {visit_end_struct (v, &err); }
@@ -282,7 +282,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, void *opaque,case FDT_BEGIN_NODE : fdt_depth++; name =fdt_get_name (fdt, fdt_offset, &name_len); -visit_start_struct (v,NULL ,NULL , name,0 , &err); +visit_start_struct (v, name,NULL ,NULL ,0 , &err);if (err) {error_propagate (errp, err);return ;
@@ -308,7 +308,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, void *opaque,return ; }for (i =0 ; i < prop_len; i++) { -visit_type_uint8 (v, (uint8_t *)&prop->data[i],NULL , &err); +visit_type_uint8 (v,NULL , (uint8_t *)&prop->data[i], &err);if (err) {error_propagate (errp, err);return ;
hw/usb/dev-storage.c +2 -2
@@ -786,7 +786,7 @@ static void usb_msd_get_bootindex(Object *obj, Visitor *v, void *opaque,USBDevice *dev =USB_DEVICE (obj);MSDState *s =USB_STORAGE_DEV (dev); -visit_type_int32 (v, &s->conf.bootindex, name, errp); +visit_type_int32 (v, name, &s->conf.bootindex, errp); } static void usb_msd_set_bootindex(Object *obj, Visitor *v, void *opaque,
@@ -797,7 +797,7 @@ static void usb_msd_set_bootindex(Object *obj, Visitor *v, void *opaque,int32_t boot_index;Error *local_err =NULL ; -visit_type_int32 (v, &boot_index, name, &local_err); +visit_type_int32 (v, name, &boot_index, &local_err);if (local_err) { goto out; }
hw/virtio/virtio-balloon.c +6 -6
@@ -117,21 +117,21 @@ static void balloon_stats_get_all(Object *obj, Visitor *v,VirtIOBalloon *s = opaque;int i; -visit_start_struct (v,NULL ,"guest-stats" , name,0 , &err); +visit_start_struct (v, name,NULL ,"guest-stats" ,0 , &err);if (err) { goto out; } -visit_type_int (v, &s->stats_last_update,"last-update" , &err); +visit_type_int (v,"last-update" , &s->stats_last_update, &err);if (err) { goto out_end; } -visit_start_struct (v,NULL ,NULL ,"stats" ,0 , &err); +visit_start_struct (v,"stats" ,NULL ,NULL ,0 , &err);if (err) { goto out_end; }for (i =0 ; i <VIRTIO_BALLOON_S_NR ; i++) { -visit_type_uint64 (v, &s->stats[i], balloon_stat_names[i], &err); +visit_type_uint64 (v, balloon_stat_names[i], &s->stats[i], &err);if (err) {break ; }
@@ -153,7 +153,7 @@ static void balloon_stats_get_poll_interval(Object *obj, Visitor *v, Error **errp) {VirtIOBalloon *s = opaque; -visit_type_int (v, &s->stats_poll_interval, name, errp); +visit_type_int (v, name, &s->stats_poll_interval, errp); } static void balloon_stats_set_poll_interval(Object *obj, Visitor *v,
@@ -164,7 +164,7 @@ static void balloon_stats_set_poll_interval(Object *obj, Visitor *v,Error *local_err =NULL ;int64_t value; -visit_type_int (v, &value, name, &local_err); +visit_type_int (v, name, &value, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
memory.c +4 -4
@@ -934,7 +934,7 @@ static void memory_region_get_addr(Object *obj, Visitor *v, void *opaque,MemoryRegion *mr =MEMORY_REGION (obj);uint64_t value = mr->addr; -visit_type_uint64 (v, &value, name, errp); +visit_type_uint64 (v, name, &value, errp); } static void memory_region_get_container(Object *obj, Visitor *v, void *opaque,
@@ -946,7 +946,7 @@ static void memory_region_get_container(Object *obj, Visitor *v, void *opaque,if (mr->container) { path =object_get_canonical_path (OBJECT (mr->container)); } -visit_type_str (v, &path, name, errp); +visit_type_str (v, name, &path, errp);if (mr->container) {g_free (path); }
@@ -966,7 +966,7 @@ static void memory_region_get_priority(Object *obj, Visitor *v, void *opaque,MemoryRegion *mr =MEMORY_REGION (obj);int32_t value = mr->priority; -visit_type_int32 (v, &value, name, errp); +visit_type_int32 (v, name, &value, errp); }static bool memory_region_get_may_overlap (Object *obj,Error **errp)
@@ -982,7 +982,7 @@ static void memory_region_get_size(Object *obj, Visitor *v, void *opaque,MemoryRegion *mr =MEMORY_REGION (obj);uint64_t value =memory_region_size (mr); -visit_type_uint64 (v, &value, name, errp); +visit_type_uint64 (v, name, &value, errp); }static void memory_region_initfn (Object *obj)
net/dump.c +2 -2
@@ -277,7 +277,7 @@ static void filter_dump_get_maxlen(Object *obj, Visitor *v, void *opaque,NetFilterDumpState *nfds =FILTER_DUMP (obj);uint32_t value = nfds->maxlen; -visit_type_uint32 (v, &value, name, errp); +visit_type_uint32 (v, name, &value, errp); } static void filter_dump_set_maxlen(Object *obj, Visitor *v, void *opaque,
@@ -287,7 +287,7 @@ static void filter_dump_set_maxlen(Object *obj, Visitor *v, void *opaque,Error *local_err =NULL ;uint32_t value; -visit_type_uint32 (v, &value, name, &local_err); +visit_type_uint32 (v, name, &value, &local_err);if (local_err) { goto out; }
net/filter-buffer.c +2 -2
@@ -138,7 +138,7 @@ static void filter_buffer_get_interval(Object *obj, Visitor *v, void *opaque,FilterBufferState *s =FILTER_BUFFER (obj);uint32_t value = s->interval; -visit_type_uint32 (v, &value, name, errp); +visit_type_uint32 (v, name, &value, errp); } static void filter_buffer_set_interval(Object *obj, Visitor *v, void *opaque,
@@ -148,7 +148,7 @@ static void filter_buffer_set_interval(Object *obj, Visitor *v, void *opaque,Error *local_err =NULL ;uint32_t value; -visit_type_uint32 (v, &value, name, &local_err); +visit_type_uint32 (v, name, &value, &local_err);if (local_err) { goto out; }
net/net.c +2 -2
@@ -1035,9 +1035,9 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp)static void net_visit (Visitor *v,int is_netdev,void **object,Error **errp) {if (is_netdev) { -visit_type_Netdev (v, (Netdev **)object,NULL , errp); +visit_type_Netdev (v,NULL , (Netdev **)object, errp); }else { -visit_type_NetLegacy (v, (NetLegacy **)object,NULL , errp); +visit_type_NetLegacy (v,NULL , (NetLegacy **)object, errp); } }
numa.c +3 -3
@@ -218,7 +218,7 @@ static int parse_numa(void *opaque, QemuOpts *opts, Error **errp) {OptsVisitor *ov =opts_visitor_new (opts); -visit_type_NumaOptions (opts_get_visitor (ov), &object,NULL , &err); +visit_type_NumaOptions (opts_get_visitor (ov),NULL , &object, &err);opts_visitor_cleanup (ov); }
@@ -245,8 +245,8 @@ error:if (object) {QapiDeallocVisitor *dv =qapi_dealloc_visitor_new (); -visit_type_NumaOptions (qapi_dealloc_get_visitor (dv), - &object,NULL ,NULL ); +visit_type_NumaOptions (qapi_dealloc_get_visitor (dv),NULL , &object, +NULL );qapi_dealloc_visitor_cleanup (dv); }
qemu-img.c +5 -6
@@ -376,8 +376,8 @@ static void dump_json_image_check(ImageCheck *check, bool quiet)QString *str;QmpOutputVisitor *ov =qmp_output_visitor_new ();QObject *obj; -visit_type_ImageCheck (qmp_output_get_visitor (ov), - &check,NULL , &local_err); +visit_type_ImageCheck (qmp_output_get_visitor (ov),NULL , &check, + &local_err); obj =qmp_output_get_qobject (ov); str =qobject_to_json_pretty (obj);assert (str !=NULL );
@@ -1939,8 +1939,8 @@ static void dump_json_image_info_list(ImageInfoList *list)QString *str;QmpOutputVisitor *ov =qmp_output_visitor_new ();QObject *obj; -visit_type_ImageInfoList (qmp_output_get_visitor (ov), - &list,NULL , &local_err); +visit_type_ImageInfoList (qmp_output_get_visitor (ov),NULL , &list, + &local_err); obj =qmp_output_get_qobject (ov); str =qobject_to_json_pretty (obj);assert (str !=NULL );
@@ -1956,8 +1956,7 @@ static void dump_json_image_info(ImageInfo *info)QString *str;QmpOutputVisitor *ov =qmp_output_visitor_new ();QObject *obj; -visit_type_ImageInfo (qmp_output_get_visitor (ov), - &info,NULL , &local_err); +visit_type_ImageInfo (qmp_output_get_visitor (ov),NULL , &info, &local_err); obj =qmp_output_get_qobject (ov); str =qobject_to_json_pretty (obj);assert (str !=NULL );
qom/object.c +24 -25
166 lines not on this page · raw message
replay/replay-input.c +2 -2
@@ -28,7 +28,7 @@ static InputEvent *qapi_clone_InputEvent(InputEvent *src) qov =qmp_output_visitor_new (); ov =qmp_output_get_visitor (qov); -visit_type_InputEvent (ov, &src,NULL , &error_abort); +visit_type_InputEvent (ov,NULL , &src, &error_abort); obj =qmp_output_get_qobject (qov);qmp_output_visitor_cleanup (qov);if (!obj) {
@@ -37,7 +37,7 @@ static InputEvent *qapi_clone_InputEvent(InputEvent *src) qiv =qmp_input_visitor_new (obj); iv =qmp_input_get_visitor (qiv); -visit_type_InputEvent (iv, &dst,NULL , &error_abort); +visit_type_InputEvent (iv,NULL , &dst, &error_abort);qmp_input_visitor_cleanup (qiv);qobject_decref (obj);
target-i386/cpu.c +15 -15
@@ -1541,7 +1541,7 @@ static void x86_cpuid_version_get_family(Object *obj, Visitor *v, void *opaque,if (value ==0xf ) { value += (env->cpuid_version >>20 ) &0xff ; } -visit_type_int (v, &value, name, errp); +visit_type_int (v, name, &value, errp); } static void x86_cpuid_version_set_family(Object *obj, Visitor *v, void *opaque,
@@ -1554,7 +1554,7 @@ static void x86_cpuid_version_set_family(Object *obj, Visitor *v, void *opaque,Error *local_err =NULL ;int64_t value; -visit_type_int (v, &value, name, &local_err); +visit_type_int (v, name, &value, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1582,7 +1582,7 @@ static void x86_cpuid_version_get_model(Object *obj, Visitor *v, void *opaque, value = (env->cpuid_version >>4 ) &0xf ; value |= ((env->cpuid_version >>16 ) &0xf ) <<4 ; -visit_type_int (v, &value, name, errp); +visit_type_int (v, name, &value, errp); } static void x86_cpuid_version_set_model(Object *obj, Visitor *v, void *opaque,
@@ -1595,7 +1595,7 @@ static void x86_cpuid_version_set_model(Object *obj, Visitor *v, void *opaque,Error *local_err =NULL ;int64_t value; -visit_type_int (v, &value, name, &local_err); +visit_type_int (v, name, &value, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1619,7 +1619,7 @@ static void x86_cpuid_version_get_stepping(Object *obj, Visitor *v,int64_t value; value = env->cpuid_version &0xf ; -visit_type_int (v, &value, name, errp); +visit_type_int (v, name, &value, errp); } static void x86_cpuid_version_set_stepping(Object *obj, Visitor *v,
@@ -1633,7 +1633,7 @@ static void x86_cpuid_version_set_stepping(Object *obj, Visitor *v,Error *local_err =NULL ;int64_t value; -visit_type_int (v, &value, name, &local_err); +visit_type_int (v, name, &value, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1726,7 +1726,7 @@ static void x86_cpuid_get_tsc_freq(Object *obj, Visitor *v, void *opaque,int64_t value; value = cpu->env.tsc_khz *1000 ; -visit_type_int (v, &value, name, errp); +visit_type_int (v, name, &value, errp); } static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, void *opaque,
@@ -1738,7 +1738,7 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, void *opaque,Error *local_err =NULL ;int64_t value; -visit_type_int (v, &value, name, &local_err); +visit_type_int (v, name, &value, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1758,7 +1758,7 @@ static void x86_cpuid_get_apic_id(Object *obj, Visitor *v, void *opaque,X86CPU *cpu =X86_CPU (obj);int64_t value = cpu->apic_id; -visit_type_int (v, &value, name, errp); +visit_type_int (v, name, &value, errp); } static void x86_cpuid_set_apic_id(Object *obj, Visitor *v, void *opaque,
@@ -1777,7 +1777,7 @@ static void x86_cpuid_set_apic_id(Object *obj, Visitor *v, void *opaque,return ; } -visit_type_int (v, &value, name, &error); +visit_type_int (v, name, &value, &error);if (error) {error_propagate (errp, error);return ;
@@ -1822,7 +1822,7 @@ static void x86_cpu_get_feature_words(Object *obj, Visitor *v, void *opaque, list = &list_entries[w]; } -visit_type_X86CPUFeatureWordInfoList (v, &list,"feature-words" , &err); +visit_type_X86CPUFeatureWordInfoList (v,"feature-words" , &list, &err);error_propagate (errp, err); }
@@ -1832,7 +1832,7 @@ static void x86_get_hv_spinlocks(Object *obj, Visitor *v, void *opaque,X86CPU *cpu =X86_CPU (obj);int64_t value = cpu->hyperv_spinlock_attempts; -visit_type_int (v, &value, name, errp); +visit_type_int (v, name, &value, errp); } static void x86_set_hv_spinlocks(Object *obj, Visitor *v, void *opaque,
@@ -1844,7 +1844,7 @@ static void x86_set_hv_spinlocks(Object *obj, Visitor *v, void *opaque,Error *err =NULL ;int64_t value; -visit_type_int (v, &value, name, &err); +visit_type_int (v, name, &value, &err);if (err) {error_propagate (errp, err);return ;
@@ -2952,7 +2952,7 @@ static void x86_cpu_get_bit_prop(Object *obj, {BitProperty *fp = opaque;bool value = (*fp->ptr & fp->mask) == fp->mask; -visit_type_bool (v, &value, name, errp); +visit_type_bool (v, name, &value, errp); } static void x86_cpu_set_bit_prop(Object *obj,
@@ -2971,7 +2971,7 @@ static void x86_cpu_set_bit_prop(Object *obj,return ; } -visit_type_bool (v, &value, name, &local_err); +visit_type_bool (v, name, &value, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
target-ppc/translate_init.c +2 -2
@@ -8059,7 +8059,7 @@ static void powerpc_get_compat(Object *obj, Visitor *v,break ; } -visit_type_str (v, &value, name, errp); +visit_type_str (v, name, &value, errp); } static void powerpc_set_compat(Object *obj, Visitor *v,
@@ -8070,7 +8070,7 @@ static void powerpc_set_compat(Object *obj, Visitor *v,Property *prop = opaque;uint32_t *max_compat =qdev_get_prop_ptr (DEVICE (obj), prop); -visit_type_str (v, &value, name, &error); +visit_type_str (v, name, &value, &error);if (error) {error_propagate (errp, error);return ;
tests/test-opts-visitor.c +3 -3
@@ -44,7 +44,7 @@ setup_fixture(OptsVisitorFixture *f, gconstpointer test_data)g_assert (opts !=NULL ); ov =opts_visitor_new (opts); -visit_type_UserDefOptions (opts_get_visitor (ov), &f->userdef,NULL , +visit_type_UserDefOptions (opts_get_visitor (ov),NULL , &f->userdef, &f->err);opts_visitor_cleanup (ov);qemu_opts_del (opts);
@@ -58,8 +58,8 @@ teardown_fixture(OptsVisitorFixture *f, gconstpointer test_data)QapiDeallocVisitor *dv; dv =qapi_dealloc_visitor_new (); -visit_type_UserDefOptions (qapi_dealloc_get_visitor (dv), &f->userdef, -NULL ,NULL ); +visit_type_UserDefOptions (qapi_dealloc_get_visitor (dv),NULL , + &f->userdef,NULL );qapi_dealloc_visitor_cleanup (dv); }error_free (f->err);
tests/test-qdev-global-props.c +2 -2
@@ -124,7 +124,7 @@ static void prop1_accessor(Object *obj, {MyType *mt =DYNAMIC_TYPE (obj); -visit_type_uint32 (v, &mt->prop1, name, errp); +visit_type_uint32 (v, name, &mt->prop1, errp); } static void prop2_accessor(Object *obj,
@@ -135,7 +135,7 @@ static void prop2_accessor(Object *obj, {MyType *mt =DYNAMIC_TYPE (obj); -visit_type_uint32 (v, &mt->prop2, name, errp); +visit_type_uint32 (v, name, &mt->prop2, errp); }static void dynamic_instance_init (Object *obj)
tests/test-qmp-commands.c +1 -1
@@ -217,7 +217,7 @@ static void test_dealloc_partial(void)qdict_put_obj (ud2_dict,"string0" ,QOBJECT (qstring_from_str (text))); qiv =qmp_input_visitor_new (QOBJECT (ud2_dict)); -visit_type_UserDefTwo (qmp_input_get_visitor (qiv), &ud2,NULL , &err); +visit_type_UserDefTwo (qmp_input_get_visitor (qiv),NULL , &ud2, &err);qmp_input_visitor_cleanup (qiv);QDECREF (ud2_dict); }
tests/test-qmp-input-strict.c +14 -14
@@ -98,7 +98,7 @@ static void test_validate_struct(TestInputVisitorData *data, v =validate_test_init (data,"{ 'integer': -42, 'boolean': true, 'string': 'foo' }" ); -visit_type_TestStruct (v, &p,NULL , &error_abort); +visit_type_TestStruct (v,NULL , &p, &error_abort);g_free (p->string);g_free (p); }
@@ -114,7 +114,7 @@ static void test_validate_struct_nested(TestInputVisitorData *data,"'dict2': { 'userdef': { 'integer': 42, " "'string': 'string' }, 'string': 'string2'}}}"); -visit_type_UserDefTwo (v, &udp,NULL , &error_abort); +visit_type_UserDefTwo (v,NULL , &udp, &error_abort);qapi_free_UserDefTwo (udp); }
@@ -126,7 +126,7 @@ static void test_validate_list(TestInputVisitorData *data, v =validate_test_init (data,"[ { 'string': 'string0', 'integer': 42 }, { 'string': 'string1', 'integer': 43 }, { 'string': 'string2', 'integer': 44 } ]" ); -visit_type_UserDefOneList (v, &head,NULL , &error_abort); +visit_type_UserDefOneList (v,NULL , &head, &error_abort);qapi_free_UserDefOneList (head); }
@@ -138,7 +138,7 @@ static void test_validate_union_native_list(TestInputVisitorData *data, v =validate_test_init (data,"{ 'type': 'integer', 'data' : [ 1, 2 ] }" ); -visit_type_UserDefNativeListUnion (v, &tmp,NULL , &error_abort); +visit_type_UserDefNativeListUnion (v,NULL , &tmp, &error_abort);qapi_free_UserDefNativeListUnion (tmp); }
@@ -154,7 +154,7 @@ static void test_validate_union_flat(TestInputVisitorData *data,"'string': 'str', " "'boolean': true }"); -visit_type_UserDefFlatUnion (v, &tmp,NULL , &error_abort); +visit_type_UserDefFlatUnion (v,NULL , &tmp, &error_abort);qapi_free_UserDefFlatUnion (tmp); }
@@ -166,7 +166,7 @@ static void test_validate_alternate(TestInputVisitorData *data, v =validate_test_init (data,"42" ); -visit_type_UserDefAlternate (v, &tmp,NULL , &error_abort); +visit_type_UserDefAlternate (v,NULL , &tmp, &error_abort);qapi_free_UserDefAlternate (tmp); }
@@ -179,7 +179,7 @@ static void test_validate_fail_struct(TestInputVisitorData *data, v =validate_test_init (data,"{ 'integer': -42, 'boolean': true, 'string': 'foo', 'extra': 42 }" ); -visit_type_TestStruct (v, &p,NULL , &err); +visit_type_TestStruct (v,NULL , &p, &err);error_free_or_abort (&err);if (p) {g_free (p->string);
@@ -196,7 +196,7 @@ static void test_validate_fail_struct_nested(TestInputVisitorData *data, v =validate_test_init (data,"{ 'string0': 'string0', 'dict1': { 'string1': 'string1', 'dict2': { 'userdef1': { 'integer': 42, 'string': 'string', 'extra': [42, 23, {'foo':'bar'}] }, 'string2': 'string2'}}}" ); -visit_type_UserDefTwo (v, &udp,NULL , &err); +visit_type_UserDefTwo (v,NULL , &udp, &err);error_free_or_abort (&err);qapi_free_UserDefTwo (udp); }
@@ -210,7 +210,7 @@ static void test_validate_fail_list(TestInputVisitorData *data, v =validate_test_init (data,"[ { 'string': 'string0', 'integer': 42 }, { 'string': 'string1', 'integer': 43 }, { 'string': 'string2', 'integer': 44, 'extra': 'ggg' } ]" ); -visit_type_UserDefOneList (v, &head,NULL , &err); +visit_type_UserDefOneList (v,NULL , &head, &err);error_free_or_abort (&err);qapi_free_UserDefOneList (head); }
@@ -225,7 +225,7 @@ static void test_validate_fail_union_native_list(TestInputVisitorData *data, v =validate_test_init (data,"{ 'type': 'integer', 'data' : [ 'string' ] }" ); -visit_type_UserDefNativeListUnion (v, &tmp,NULL , &err); +visit_type_UserDefNativeListUnion (v,NULL , &tmp, &err);error_free_or_abort (&err);qapi_free_UserDefNativeListUnion (tmp); }
@@ -239,7 +239,7 @@ static void test_validate_fail_union_flat(TestInputVisitorData *data, v =validate_test_init (data,"{ 'string': 'c', 'integer': 41, 'boolean': true }" ); -visit_type_UserDefFlatUnion (v, &tmp,NULL , &err); +visit_type_UserDefFlatUnion (v,NULL , &tmp, &err);error_free_or_abort (&err);qapi_free_UserDefFlatUnion (tmp); }
@@ -254,7 +254,7 @@ static void test_validate_fail_union_flat_no_discrim(TestInputVisitorData *data,/* test situation where discriminator field ('enum1' here) is missing */ v =validate_test_init (data,"{ 'integer': 42, 'string': 'c', 'string1': 'd', 'string2': 'e' }" ); -visit_type_UserDefFlatUnion2 (v, &tmp,NULL , &err); +visit_type_UserDefFlatUnion2 (v,NULL , &tmp, &err);error_free_or_abort (&err);qapi_free_UserDefFlatUnion2 (tmp); }
@@ -268,7 +268,7 @@ static void test_validate_fail_alternate(TestInputVisitorData *data, v =validate_test_init (data,"3.14" ); -visit_type_UserDefAlternate (v, &tmp,NULL , &err); +visit_type_UserDefAlternate (v,NULL , &tmp, &err);error_free_or_abort (&err);qapi_free_UserDefAlternate (tmp); }
@@ -281,7 +281,7 @@ static void do_test_validate_qmp_introspect(TestInputVisitorData *data, v =validate_test_init_raw (data, schema_json); -visit_type_SchemaInfoList (v, &schema,NULL , &error_abort); +visit_type_SchemaInfoList (v,NULL , &schema, &error_abort);g_assert (schema);qapi_free_SchemaInfoList (schema);
tests/test-qmp-input-visitor.c +40 -40
298 lines not on this page · raw message
tests/test-qmp-output-visitor.c +17 -17
@@ -47,7 +47,7 @@ static void test_visitor_out_int(TestOutputVisitorData *data,int64_t value =-42 ;QObject *obj; -visit_type_int (data->ov, &value,NULL , &error_abort); +visit_type_int (data->ov,NULL , &value, &error_abort); obj =qmp_output_get_qobject (data->qov);g_assert (obj !=NULL );
@@ -63,7 +63,7 @@ static void test_visitor_out_bool(TestOutputVisitorData *data,bool value = true;QObject *obj; -visit_type_bool (data->ov, &value,NULL , &error_abort); +visit_type_bool (data->ov,NULL , &value, &error_abort); obj =qmp_output_get_qobject (data->qov);g_assert (obj !=NULL );
@@ -79,7 +79,7 @@ static void test_visitor_out_number(TestOutputVisitorData *data,double value =3.14 ;QObject *obj; -visit_type_number (data->ov, &value,NULL , &error_abort); +visit_type_number (data->ov,NULL , &value, &error_abort); obj =qmp_output_get_qobject (data->qov);g_assert (obj !=NULL );
@@ -95,7 +95,7 @@ static void test_visitor_out_string(TestOutputVisitorData *data,char *string = (char *)"Q E M U" ;QObject *obj; -visit_type_str (data->ov, &string,NULL , &error_abort); +visit_type_str (data->ov,NULL , &string, &error_abort); obj =qmp_output_get_qobject (data->qov);g_assert (obj !=NULL );
@@ -112,7 +112,7 @@ static void test_visitor_out_no_string(TestOutputVisitorData *data,QObject *obj;/* A null string should return "" */ -visit_type_str (data->ov, &string,NULL , &error_abort); +visit_type_str (data->ov,NULL , &string, &error_abort); obj =qmp_output_get_qobject (data->qov);g_assert (obj !=NULL );
@@ -129,7 +129,7 @@ static void test_visitor_out_enum(TestOutputVisitorData *data,EnumOne i;for (i =0 ; i <ENUM_ONE__MAX ; i++) { -visit_type_EnumOne (data->ov, &i,"unused" , &error_abort); +visit_type_EnumOne (data->ov,"unused" , &i, &error_abort); obj =qmp_output_get_qobject (data->qov);g_assert (obj !=NULL );
@@ -148,7 +148,7 @@ static void test_visitor_out_enum_errors(TestOutputVisitorData *data,for (i =0 ; i <ARRAY_SIZE (bad_values) ; i++) { err =NULL ; -visit_type_EnumOne (data->ov, &bad_values[i],"unused" , &err); +visit_type_EnumOne (data->ov,"unused" , &bad_values[i], &err);g_assert (err);error_free (err); }
@@ -165,7 +165,7 @@ static void test_visitor_out_struct(TestOutputVisitorData *data,QObject *obj;QDict *qdict; -visit_type_TestStruct (data->ov, &p,NULL , &error_abort); +visit_type_TestStruct (data->ov,NULL , &p, &error_abort); obj =qmp_output_get_qobject (data->qov);g_assert (obj !=NULL );
@@ -210,7 +210,7 @@ static void test_visitor_out_struct_nested(TestOutputVisitorData *data, ud2->dict1->dict3->userdef->integer = value; ud2->dict1->dict3->string =g_strdup (strings[3 ]); -visit_type_UserDefTwo (data->ov, &ud2,"unused" , &error_abort); +visit_type_UserDefTwo (data->ov,"unused" , &ud2, &error_abort); obj =qmp_output_get_qobject (data->qov);g_assert (obj !=NULL );
@@ -257,7 +257,7 @@ static void test_visitor_out_struct_errors(TestOutputVisitorData *data, err =NULL ; u.has_enum1 = true; u.enum1 = bad_values[i]; -visit_type_UserDefOne (data->ov, &pu,"unused" , &err); +visit_type_UserDefOne (data->ov,"unused" , &pu, &err);g_assert (err);error_free (err); }
@@ -289,7 +289,7 @@ static void test_visitor_out_list(TestOutputVisitorData *data, head = p; } -visit_type_TestStructList (data->ov, &head,NULL , &error_abort); +visit_type_TestStructList (data->ov,NULL , &head, &error_abort); obj =qmp_output_get_qobject (data->qov);g_assert (obj !=NULL );
@@ -356,7 +356,7 @@ static void test_visitor_out_any(TestOutputVisitorData *data,QObject *obj; qobj =QOBJECT (qint_from_int (-42 )); -visit_type_any (data->ov, &qobj,NULL , &error_abort); +visit_type_any (data->ov,NULL , &qobj, &error_abort); obj =qmp_output_get_qobject (data->qov);g_assert (obj !=NULL );g_assert (qobject_type (obj) ==QTYPE_QINT );
@@ -369,7 +369,7 @@ static void test_visitor_out_any(TestOutputVisitorData *data,qdict_put (qdict,"boolean" ,qbool_from_bool (true));qdict_put (qdict,"string" ,qstring_from_str ("foo" )); qobj =QOBJECT (qdict); -visit_type_any (data->ov, &qobj,NULL , &error_abort); +visit_type_any (data->ov,NULL , &qobj, &error_abort);qobject_decref (qobj); obj =qmp_output_get_qobject (data->qov);g_assert (obj !=NULL );
@@ -406,7 +406,7 @@ static void test_visitor_out_union_flat(TestOutputVisitorData *data, tmp->integer =41 ; tmp->u.value1->boolean = true; -visit_type_UserDefFlatUnion (data->ov, &tmp,NULL , &error_abort); +visit_type_UserDefFlatUnion (data->ov,NULL , &tmp, &error_abort); arg =qmp_output_get_qobject (data->qov);g_assert (qobject_type (arg) ==QTYPE_QDICT );
@@ -431,7 +431,7 @@ static void test_visitor_out_alternate(TestOutputVisitorData *data, tmp->type =QTYPE_QINT ; tmp->u.i =42 ; -visit_type_UserDefAlternate (data->ov, &tmp,NULL , &error_abort); +visit_type_UserDefAlternate (data->ov,NULL , &tmp, &error_abort); arg =qmp_output_get_qobject (data->qov);g_assert (qobject_type (arg) ==QTYPE_QINT );
@@ -444,7 +444,7 @@ static void test_visitor_out_alternate(TestOutputVisitorData *data, tmp->type =QTYPE_QSTRING ; tmp->u.s =g_strdup ("hello" ); -visit_type_UserDefAlternate (data->ov, &tmp,NULL , &error_abort); +visit_type_UserDefAlternate (data->ov,NULL , &tmp, &error_abort); arg =qmp_output_get_qobject (data->qov);g_assert (qobject_type (arg) ==QTYPE_QSTRING );
@@ -690,7 +690,7 @@ static void test_native_list(TestOutputVisitorData *data, cvalue->type = kind;init_native_list (cvalue); -visit_type_UserDefNativeListUnion (data->ov, &cvalue,NULL , &error_abort); +visit_type_UserDefNativeListUnion (data->ov,NULL , &cvalue, &error_abort); obj =qmp_output_get_qobject (data->qov);check_native_list (obj, cvalue->type);
tests/test-string-input-visitor.c +17 -17
@@ -59,7 +59,7 @@ static void test_visitor_in_int(TestInputVisitorData *data, v =visitor_input_test_init (data,"-42" ); -visit_type_int (v, &res,NULL , &err); +visit_type_int (v,NULL , &res, &err);g_assert (!err); g_assert_cmpint(res, ==, value); }
@@ -74,7 +74,7 @@ static void test_visitor_in_intList(TestInputVisitorData *data, v =visitor_input_test_init (data,"1,2,0,2-4,20,5-9,1-8" ); -visit_type_int16List (v, &res,NULL , &error_abort); +visit_type_int16List (v,NULL , &res, &error_abort); tmp = res;while (i <sizeof (value) /sizeof (value[0 ])) {g_assert (tmp);
@@ -100,42 +100,42 @@ static void test_visitor_in_bool(TestInputVisitorData *data, v =visitor_input_test_init (data,"true" ); -visit_type_bool (v, &res,NULL , &err); +visit_type_bool (v,NULL , &res, &err);g_assert (!err); g_assert_cmpint(res, ==, true);visitor_input_teardown (data, unused); v =visitor_input_test_init (data,"yes" ); -visit_type_bool (v, &res,NULL , &err); +visit_type_bool (v,NULL , &res, &err);g_assert (!err); g_assert_cmpint(res, ==, true);visitor_input_teardown (data, unused); v =visitor_input_test_init (data,"on" ); -visit_type_bool (v, &res,NULL , &err); +visit_type_bool (v,NULL , &res, &err);g_assert (!err); g_assert_cmpint(res, ==, true);visitor_input_teardown (data, unused); v =visitor_input_test_init (data,"false" ); -visit_type_bool (v, &res,NULL , &err); +visit_type_bool (v,NULL , &res, &err);g_assert (!err); g_assert_cmpint(res, ==, false);visitor_input_teardown (data, unused); v =visitor_input_test_init (data,"no" ); -visit_type_bool (v, &res,NULL , &err); +visit_type_bool (v,NULL , &res, &err);g_assert (!err); g_assert_cmpint(res, ==, false);visitor_input_teardown (data, unused); v =visitor_input_test_init (data,"off" ); -visit_type_bool (v, &res,NULL , &err); +visit_type_bool (v,NULL , &res, &err);g_assert (!err); g_assert_cmpint(res, ==, false); }
@@ -149,7 +149,7 @@ static void test_visitor_in_number(TestInputVisitorData *data, v =visitor_input_test_init (data,"3.14" ); -visit_type_number (v, &res,NULL , &err); +visit_type_number (v,NULL , &res, &err);g_assert (!err); g_assert_cmpfloat(res, ==, value); }
@@ -163,7 +163,7 @@ static void test_visitor_in_string(TestInputVisitorData *data, v =visitor_input_test_init (data, value); -visit_type_str (v, &res,NULL , &err); +visit_type_str (v,NULL , &res, &err);g_assert (!err); g_assert_cmpstr(res, ==, value);
@@ -182,7 +182,7 @@ static void test_visitor_in_enum(TestInputVisitorData *data, v =visitor_input_test_init (data, EnumOne_lookup[i]); -visit_type_EnumOne (v, &res,NULL , &err); +visit_type_EnumOne (v,NULL , &res, &err);g_assert (!err); g_assert_cmpint(i, ==, res);
@@ -220,29 +220,29 @@ static void test_visitor_in_fuzz(TestInputVisitorData *data, } v =visitor_input_test_init (data, buf); -visit_type_int (v, &ires,NULL ,NULL ); +visit_type_int (v,NULL , &ires,NULL );visitor_input_teardown (data,NULL ); v =visitor_input_test_init (data, buf); -visit_type_intList (v, &ilres,NULL ,NULL ); +visit_type_intList (v,NULL , &ilres,NULL );visitor_input_teardown (data,NULL ); v =visitor_input_test_init (data, buf); -visit_type_bool (v, &bres,NULL ,NULL ); +visit_type_bool (v,NULL , &bres,NULL );visitor_input_teardown (data,NULL ); v =visitor_input_test_init (data, buf); -visit_type_number (v, &nres,NULL ,NULL ); +visit_type_number (v,NULL , &nres,NULL );visitor_input_teardown (data,NULL ); v =visitor_input_test_init (data, buf); sres =NULL ; -visit_type_str (v, &sres,NULL ,NULL ); +visit_type_str (v,NULL , &sres,NULL );g_free (sres);visitor_input_teardown (data,NULL ); v =visitor_input_test_init (data, buf); -visit_type_EnumOne (v, &eres,NULL ,NULL ); +visit_type_EnumOne (v,NULL , &eres,NULL );visitor_input_teardown (data,NULL ); } }
tests/test-string-output-visitor.c +8 -8
@@ -61,7 +61,7 @@ static void test_visitor_out_int(TestOutputVisitorData *data,Error *err =NULL ;char *str; -visit_type_int (data->ov, &value,NULL , &err); +visit_type_int (data->ov,NULL , &value, &err);g_assert (!err); str =string_output_get_string (data->sov);
@@ -90,7 +90,7 @@ static void test_visitor_out_intList(TestOutputVisitorData *data, tmp = &(*tmp)->next; } -visit_type_intList (data->ov, &list,NULL , &err); +visit_type_intList (data->ov,NULL , &list, &err);g_assert (err ==NULL ); str =string_output_get_string (data->sov);
@@ -120,7 +120,7 @@ static void test_visitor_out_bool(TestOutputVisitorData *data,bool value = true;char *str; -visit_type_bool (data->ov, &value,NULL , &err); +visit_type_bool (data->ov,NULL , &value, &err);g_assert (!err); str =string_output_get_string (data->sov);
@@ -136,7 +136,7 @@ static void test_visitor_out_number(TestOutputVisitorData *data,Error *err =NULL ;char *str; -visit_type_number (data->ov, &value,NULL , &err); +visit_type_number (data->ov,NULL , &value, &err);g_assert (!err); str =string_output_get_string (data->sov);
@@ -153,7 +153,7 @@ static void test_visitor_out_string(TestOutputVisitorData *data,Error *err =NULL ;char *str; -visit_type_str (data->ov, &string,NULL , &err); +visit_type_str (data->ov,NULL , &string, &err);g_assert (!err); str =string_output_get_string (data->sov);
@@ -174,7 +174,7 @@ static void test_visitor_out_no_string(TestOutputVisitorData *data,char *str;/* A null string should return "" */ -visit_type_str (data->ov, &string,NULL , &err); +visit_type_str (data->ov,NULL , &string, &err);g_assert (!err); str =string_output_get_string (data->sov);
@@ -197,7 +197,7 @@ static void test_visitor_out_enum(TestOutputVisitorData *data,for (i =0 ; i <ENUM_ONE__MAX ; i++) {char *str_human; -visit_type_EnumOne (data->ov, &i,"unused" , &err); +visit_type_EnumOne (data->ov,"unused" , &i, &err);g_assert (!err); str_human =g_strdup_printf ("\"%s\"" , EnumOne_lookup[i]);
@@ -222,7 +222,7 @@ static void test_visitor_out_enum_errors(TestOutputVisitorData *data,for (i =0 ; i <ARRAY_SIZE (bad_values) ; i++) { err =NULL ; -visit_type_EnumOne (data->ov, &bad_values[i],"unused" , &err); +visit_type_EnumOne (data->ov,"unused" , &bad_values[i], &err);g_assert (err);error_free (err); }
tests/test-visitor-serialization.c +27 -27
126 lines not on this page · raw message
util/qemu-sockets.c +2 -2
@@ -1122,7 +1122,7 @@ void qapi_copy_SocketAddress(SocketAddress **p_dest, qov =qmp_output_visitor_new (); ov =qmp_output_get_visitor (qov); -visit_type_SocketAddress (ov, &src,NULL , &error_abort); +visit_type_SocketAddress (ov,NULL , &src, &error_abort); obj =qmp_output_get_qobject (qov);qmp_output_visitor_cleanup (qov);if (!obj) {
@@ -1131,7 +1131,7 @@ void qapi_copy_SocketAddress(SocketAddress **p_dest, qiv =qmp_input_visitor_new (obj); iv =qmp_input_get_visitor (qiv); -visit_type_SocketAddress (iv, p_dest,NULL , &error_abort); +visit_type_SocketAddress (iv,NULL , p_dest, &error_abort);qmp_input_visitor_cleanup (qiv);qobject_decref (obj); }
vl.c +2 -2
@@ -2840,7 +2840,7 @@ static int object_create(void *opaque, QemuOpts *opts, Error **errp) }qdict_del (pdict,"qom-type" ); -visit_type_str (v, &type,"qom-type" , &err); +visit_type_str (v,"qom-type" , &type, &err);if (err) { goto out; }
@@ -2850,7 +2850,7 @@ static int object_create(void *opaque, QemuOpts *opts, Error **errp) }qdict_del (pdict,"id" ); -visit_type_str (v, &id,"id" , &err); +visit_type_str (v,"id" , &id, &err);if (err) { goto out_end; }
Signature · 1 line
2.5.0
PATCH v10 19/25 qom: Swap 'name' next to visitor in ObjectPropertyAccessor
In reply to Eric BlakeSimilar to the previous patch, it's nice to have all functions in the tree that involve a visitor and a name for conversion to or from QAPI to consistently stick the 'name' parameter next to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c, then running this Coccinelle script and touching up the fallout (Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)---
v10: redo Coccinelle script with 'typedef' instead of type; net result is the same so R-b retained
v9: typo fix in commit message, rebase to master context
v8: new patch
--- include/qom/object.h | 4 +- backends/hostmem.c | 16 +++--- bootdevice.c | 8 +-- hw/acpi/ich9.c | 35 +++++------- hw/block/nvme.c | 8 +-- hw/core/machine.c | 14 ++--- hw/core/qdev-properties-system.c | 32 +++++------ hw/core/qdev-properties.c | 116 +++++++++++++++++++-------------------- hw/core/qdev.c | 5 +- hw/i386/pc.c | 29 +++++----- hw/ide/qdev.c | 8 +-- hw/intc/xics.c | 12 ++-- hw/isa/lpc_ich9.c | 5 +- hw/mem/pc-dimm.c | 4 +- hw/misc/edu.c | 4 +- hw/misc/tmp105.c | 8 +-- hw/net/ne2000-isa.c | 10 ++-- hw/pci-host/piix.c | 10 ++-- hw/pci-host/q35.c | 13 ++--- hw/ppc/spapr_drc.c | 16 +++--- hw/usb/dev-storage.c | 8 +-- hw/virtio/virtio-balloon.c | 8 +-- memory.c | 18 +++--- net/dump.c | 8 +-- net/filter-buffer.c | 10 ++-- qom/object.c | 75 +++++++++++++------------ target-i386/cpu.c | 67 +++++++++++----------- target-ppc/translate_init.c | 8 +-- tests/test-qdev-global-props.c | 14 ++--- 29 files changed, 282 insertions(+), 291 deletions(-)
include/qom/object.h +2 -2
@@ -290,16 +290,16 @@ typedef struct InterfaceInfo InterfaceInfo;* ObjectPropertyAccessor: * @obj: the object that owns the property * @v: the visitor that contains the property data +* @name: the name of the property * @opaque: the object property opaque -* @name: the name of the property * @errp: a pointer to an Error that is filled if getting/setting fails. * * Called when trying to get/set a property. */ typedef void (ObjectPropertyAccessor )(Object *obj,Visitor *v, -void *opaque,const char *name, +void *opaque,Error **errp);/**
backends/hostmem.c +8 -8
@@ -26,8 +26,8 @@ QEMU_BUILD_BUG_ON(HOST_MEM_POLICY_INTERLEAVE != MPOL_INTERLEAVE);#endif static void -host_memory_backend_get_size (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +host_memory_backend_get_size (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {HostMemoryBackend *backend =MEMORY_BACKEND (obj);uint64_t value = backend->size;
@@ -36,8 +36,8 @@ host_memory_backend_get_size(Object *obj, Visitor *v, void *opaque, }static void -host_memory_backend_set_size (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +host_memory_backend_set_size (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {HostMemoryBackend *backend =MEMORY_BACKEND (obj);Error *local_err =NULL ;
@@ -63,8 +63,8 @@ out: }static void -host_memory_backend_get_host_nodes (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +host_memory_backend_get_host_nodes (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {HostMemoryBackend *backend =MEMORY_BACKEND (obj);uint16List *host_nodes =NULL ;
@@ -95,8 +95,8 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, void *opaque, }static void -host_memory_backend_set_host_nodes (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +host_memory_backend_set_host_nodes (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {#ifdef CONFIG_NUMA HostMemoryBackend *backend =MEMORY_BACKEND (obj);
bootdevice.c +4 -4
@@ -270,15 +270,15 @@ typedef struct {DeviceState *dev; } BootIndexProperty; -static void device_get_bootindex (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void device_get_bootindex (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {BootIndexProperty *prop = opaque;visit_type_int32 (v, name, prop->bootindex, errp); } -static void device_set_bootindex (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void device_set_bootindex (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {BootIndexProperty *prop = opaque;int32_t boot_index;
hw/acpi/ich9.c +14 -21
@@ -282,9 +282,8 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, } } -static void ich9_pm_get_gpe0_blk (Object *obj,Visitor *v, -void *opaque,const char *name, -Error **errp) +static void ich9_pm_get_gpe0_blk (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {ICH9LPCPMRegs *pm = opaque;uint32_t value = pm->pm_io_base +ICH9_PMIO_GPE0_STS ;
@@ -307,9 +306,8 @@ static void ich9_pm_set_memory_hotplug_support(Object *obj, bool value, s->pm.acpi_memory_hotplug.is_enabled = value; } -static void ich9_pm_get_disable_s3 (Object *obj,Visitor *v, -void *opaque,const char *name, -Error **errp) +static void ich9_pm_get_disable_s3 (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {ICH9LPCPMRegs *pm = opaque;uint8_t value = pm->disable_s3;
@@ -317,9 +315,8 @@ static void ich9_pm_get_disable_s3(Object *obj, Visitor *v,visit_type_uint8 (v, name, &value, errp); } -static void ich9_pm_set_disable_s3 (Object *obj,Visitor *v, -void *opaque,const char *name, -Error **errp) +static void ich9_pm_set_disable_s3 (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {ICH9LPCPMRegs *pm = opaque;Error *local_err =NULL ;
@@ -334,9 +331,8 @@ out:error_propagate (errp, local_err); } -static void ich9_pm_get_disable_s4 (Object *obj,Visitor *v, -void *opaque,const char *name, -Error **errp) +static void ich9_pm_get_disable_s4 (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {ICH9LPCPMRegs *pm = opaque;uint8_t value = pm->disable_s4;
@@ -344,9 +340,8 @@ static void ich9_pm_get_disable_s4(Object *obj, Visitor *v,visit_type_uint8 (v, name, &value, errp); } -static void ich9_pm_set_disable_s4 (Object *obj,Visitor *v, -void *opaque,const char *name, -Error **errp) +static void ich9_pm_set_disable_s4 (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {ICH9LPCPMRegs *pm = opaque;Error *local_err =NULL ;
@@ -361,9 +356,8 @@ out:error_propagate (errp, local_err); } -static void ich9_pm_get_s4_val (Object *obj,Visitor *v, -void *opaque,const char *name, -Error **errp) +static void ich9_pm_get_s4_val (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {ICH9LPCPMRegs *pm = opaque;uint8_t value = pm->s4_val;
@@ -371,9 +365,8 @@ static void ich9_pm_get_s4_val(Object *obj, Visitor *v,visit_type_uint8 (v, name, &value, errp); } -static void ich9_pm_set_s4_val (Object *obj,Visitor *v, -void *opaque,const char *name, -Error **errp) +static void ich9_pm_set_s4_val (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {ICH9LPCPMRegs *pm = opaque;Error *local_err =NULL ;
hw/block/nvme.c +4 -4
@@ -916,16 +916,16 @@ static void nvme_class_init(ObjectClass *oc, void *data) dc->vmsd = &nvme_vmstate; } -static void nvme_get_bootindex (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void nvme_get_bootindex (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {NvmeCtrl *s =NVME (obj);visit_type_int32 (v, name, &s->conf.bootindex, errp); } -static void nvme_set_bootindex (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void nvme_set_bootindex (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {NvmeCtrl *s =NVME (obj);int32_t boot_index;
hw/core/machine.c +7 -7
@@ -33,7 +33,7 @@ static void machine_set_accel(Object *obj, const char *value, Error **errp) }static void machine_set_kernel_irqchip (Object *obj,Visitor *v, -void *opaque,const char *name, +const char *name,void *opaque,Error **errp) {Error *err =NULL ;
@@ -68,7 +68,7 @@ static void machine_set_kernel_irqchip(Object *obj, Visitor *v, }static void machine_get_kvm_shadow_mem (Object *obj,Visitor *v, -void *opaque,const char *name, +const char *name,void *opaque,Error **errp) {MachineState *ms =MACHINE (obj);
@@ -78,7 +78,7 @@ static void machine_get_kvm_shadow_mem(Object *obj, Visitor *v, }static void machine_set_kvm_shadow_mem (Object *obj,Visitor *v, -void *opaque,const char *name, +const char *name,void *opaque,Error **errp) {MachineState *ms =MACHINE (obj);
@@ -170,8 +170,8 @@ static void machine_set_dumpdtb(Object *obj, const char *value, Error **errp) }static void machine_get_phandle_start (Object *obj,Visitor *v, -void *opaque,const char *name, -Error **errp) +const char *name,void *opaque, +Error **errp) {MachineState *ms =MACHINE (obj);int64_t value = ms->phandle_start;
@@ -180,8 +180,8 @@ static void machine_get_phandle_start(Object *obj, Visitor *v, }static void machine_set_phandle_start (Object *obj,Visitor *v, -void *opaque,const char *name, -Error **errp) +const char *name,void *opaque, +Error **errp) {MachineState *ms =MACHINE (obj);Error *error =NULL ;
hw/core/qdev-properties-system.c +16 -16
@@ -111,14 +111,14 @@ static char *print_drive(void *ptr)return g_strdup (blk_name (ptr)); } -static void get_drive (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void get_drive (Object *obj,Visitor *v,const char *name,void *opaque, +Error **errp) {get_pointer (obj, v, opaque, print_drive, name, errp); } -static void set_drive (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void set_drive (Object *obj,Visitor *v,const char *name,void *opaque, +Error **errp) {set_pointer (obj, v, opaque, parse_drive, name, errp); }
@@ -172,14 +172,14 @@ static char *print_chr(void *ptr)return g_strdup (val); } -static void get_chr (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void get_chr (Object *obj,Visitor *v,const char *name,void *opaque, +Error **errp) {get_pointer (obj, v, opaque, print_chr, name, errp); } -static void set_chr (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void set_chr (Object *obj,Visitor *v,const char *name,void *opaque, +Error **errp) {set_pointer (obj, v, opaque, parse_chr, name, errp); }
@@ -193,8 +193,8 @@ PropertyInfo qdev_prop_chr = { };/* --- netdev device --- */ -static void get_netdev (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void get_netdev (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {DeviceState *dev =DEVICE (obj);Property *prop = opaque;
@@ -205,8 +205,8 @@ static void get_netdev(Object *obj, Visitor *v, void *opaque,g_free (p); } -static void set_netdev (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void set_netdev (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {DeviceState *dev =DEVICE (obj);Property *prop = opaque;
@@ -292,8 +292,8 @@ static int print_vlan(DeviceState *dev, Property *prop, char *dest, size_t len)return snprintf (dest, len,"<null>" ); } -static void get_vlan (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void get_vlan (Object *obj,Visitor *v,const char *name,void *opaque, +Error **errp) {DeviceState *dev =DEVICE (obj);Property *prop = opaque;
@@ -310,8 +310,8 @@ static void get_vlan(Object *obj, Visitor *v, void *opaque,visit_type_int32 (v, name, &id, errp); } -static void set_vlan (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void set_vlan (Object *obj,Visitor *v,const char *name,void *opaque, +Error **errp) {DeviceState *dev =DEVICE (obj);Property *prop = opaque;
hw/core/qdev-properties.c +58 -58
290 lines not on this page · raw message
hw/core/qdev.c +3 -2
@@ -893,8 +893,9 @@ char *qdev_get_dev_path(DeviceState *dev)* Legacy property handling */ -static void qdev_get_legacy_property (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void qdev_get_legacy_property (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) {DeviceState *dev =DEVICE (obj);Property *prop = opaque;
hw/i386/pc.c +15 -14
@@ -1755,8 +1755,9 @@ static HotplugHandler *pc_get_hotpug_handler(MachineState *machine, }static void -pc_machine_get_hotplug_memory_region_size (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +pc_machine_get_hotplug_memory_region_size (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) {PCMachineState *pcms =PC_MACHINE (obj);int64_t value =memory_region_size (&pcms->hotplug_memory.mr);
@@ -1765,8 +1766,8 @@ pc_machine_get_hotplug_memory_region_size(Object *obj, Visitor *v, void *opaque, }static void pc_machine_get_max_ram_below_4g (Object *obj,Visitor *v, -void *opaque,const char *name, -Error **errp) +const char *name,void *opaque, +Error **errp) {PCMachineState *pcms =PC_MACHINE (obj);uint64_t value = pcms->max_ram_below_4g;
@@ -1775,8 +1776,8 @@ static void pc_machine_get_max_ram_below_4g(Object *obj, Visitor *v, }static void pc_machine_set_max_ram_below_4g (Object *obj,Visitor *v, -void *opaque,const char *name, -Error **errp) +const char *name,void *opaque, +Error **errp) {PCMachineState *pcms =PC_MACHINE (obj);Error *error =NULL ;
@@ -1804,8 +1805,8 @@ static void pc_machine_set_max_ram_below_4g(Object *obj, Visitor *v, pcms->max_ram_below_4g = value; } -static void pc_machine_get_vmport (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void pc_machine_get_vmport (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {PCMachineState *pcms =PC_MACHINE (obj);OnOffAuto vmport = pcms->vmport;
@@ -1813,8 +1814,8 @@ static void pc_machine_get_vmport(Object *obj, Visitor *v, void *opaque,visit_type_OnOffAuto (v, name, &vmport, errp); } -static void pc_machine_set_vmport (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void pc_machine_set_vmport (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {PCMachineState *pcms =PC_MACHINE (obj);
@@ -1846,8 +1847,8 @@ bool pc_machine_is_smm_enabled(PCMachineState *pcms)return false; } -static void pc_machine_get_smm (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void pc_machine_get_smm (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {PCMachineState *pcms =PC_MACHINE (obj);OnOffAuto smm = pcms->smm;
@@ -1855,8 +1856,8 @@ static void pc_machine_get_smm(Object *obj, Visitor *v, void *opaque,visit_type_OnOffAuto (v, name, &smm, errp); } -static void pc_machine_set_smm (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void pc_machine_set_smm (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {PCMachineState *pcms =PC_MACHINE (obj);
hw/ide/qdev.c +4 -4
@@ -199,16 +199,16 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind)return 0 ; } -static void ide_dev_get_bootindex (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void ide_dev_get_bootindex (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {IDEDevice *d =IDE_DEVICE (obj);visit_type_int32 (v, name, &d->conf.bootindex, errp); } -static void ide_dev_set_bootindex (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void ide_dev_set_bootindex (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {IDEDevice *d =IDE_DEVICE (obj);int32_t boot_index;
hw/intc/xics.c +6 -6
@@ -88,8 +88,8 @@ static void xics_common_reset(DeviceState *d)device_reset (DEVICE (icp->ics)); } -static void xics_prop_get_nr_irqs (Object *obj,Visitor *v, -void *opaque,const char *name,Error **errp) +static void xics_prop_get_nr_irqs (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {XICSState *icp =XICS_COMMON (obj);int64_t value = icp->nr_irqs;
@@ -97,8 +97,8 @@ static void xics_prop_get_nr_irqs(Object *obj, Visitor *v,visit_type_int (v, name, &value, errp); } -static void xics_prop_set_nr_irqs (Object *obj,Visitor *v, -void *opaque,const char *name,Error **errp) +static void xics_prop_set_nr_irqs (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {XICSState *icp =XICS_COMMON (obj);XICSStateClass *info =XICS_COMMON_GET_CLASS (icp);
@@ -122,7 +122,7 @@ static void xics_prop_set_nr_irqs(Object *obj, Visitor *v, }static void xics_prop_get_nr_servers (Object *obj,Visitor *v, -void *opaque,const char *name, +const char *name,void *opaque,Error **errp) {XICSState *icp =XICS_COMMON (obj);
@@ -132,7 +132,7 @@ static void xics_prop_get_nr_servers(Object *obj, Visitor *v, }static void xics_prop_set_nr_servers (Object *obj,Visitor *v, -void *opaque,const char *name, +const char *name,void *opaque,Error **errp) {XICSState *icp =XICS_COMMON (obj);
hw/isa/lpc_ich9.c +2 -3
@@ -569,9 +569,8 @@ Object *ich9_lpc_find(void)return o; } -static void ich9_lpc_get_sci_int (Object *obj,Visitor *v, -void *opaque,const char *name, -Error **errp) +static void ich9_lpc_get_sci_int (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {ICH9LPCState *lpc =ICH9_LPC_DEVICE (obj);uint32_t value =ich9_lpc_sci_irq (lpc);
hw/mem/pc-dimm.c +2 -2
@@ -372,8 +372,8 @@ static Property pc_dimm_properties[] = { DEFINE_PROP_END_OF_LIST(), }; -static void pc_dimm_get_size (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void pc_dimm_get_size (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {int64_t value;MemoryRegion *mr;
hw/misc/edu.c +2 -2
@@ -362,8 +362,8 @@ static void pci_edu_uninit(PCIDevice *pdev)timer_del (&edu->dma_timer); } -static void edu_obj_uint64 (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void edu_obj_uint64 (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {uint64_t *val = opaque;
hw/misc/tmp105.c +4 -4
@@ -52,8 +52,8 @@ static void tmp105_alarm_update(TMP105State *s)tmp105_interrupt_update (s); } -static void tmp105_get_temperature (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void tmp105_get_temperature (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {TMP105State *s =TMP105 (obj);int64_t value = s->temperature *1000 /256 ;
@@ -64,8 +64,8 @@ static void tmp105_get_temperature(Object *obj, Visitor *v, void *opaque,/* Units are 0.001 centigrades relative to 0 C. s->temperature is 8.8 * fixed point, so units are 1/256 centigrades. A simple ratio will do. */ -static void tmp105_set_temperature (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void tmp105_set_temperature (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {TMP105State *s =TMP105 (obj);Error *local_err =NULL ;
hw/net/ne2000-isa.c +6 -4
@@ -93,8 +93,9 @@ static void isa_ne2000_class_initfn(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_NETWORK , dc->categories); } -static void isa_ne2000_get_bootindex (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void isa_ne2000_get_bootindex (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) {ISANE2000State *isa =ISA_NE2000 (obj);NE2000State *s = &isa->ne2000;
@@ -102,8 +103,9 @@ static void isa_ne2000_get_bootindex(Object *obj, Visitor *v, void *opaque,visit_type_int32 (v, name, &s->c.bootindex, errp); } -static void isa_ne2000_set_bootindex (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void isa_ne2000_set_bootindex (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) {ISANE2000State *isa =ISA_NE2000 (obj);NE2000State *s = &isa->ne2000;
hw/pci-host/piix.c +5 -5
@@ -215,7 +215,7 @@ static const VMStateDescription vmstate_i440fx = { };static void i440fx_pcihost_get_pci_hole_start (Object *obj,Visitor *v, -void *opaque,const char *name, +const char *name,void *opaque,Error **errp) {I440FXState *s =I440FX_PCI_HOST_BRIDGE (obj);
@@ -225,7 +225,7 @@ static void i440fx_pcihost_get_pci_hole_start(Object *obj, Visitor *v, }static void i440fx_pcihost_get_pci_hole_end (Object *obj,Visitor *v, -void *opaque,const char *name, +const char *name,void *opaque,Error **errp) {I440FXState *s =I440FX_PCI_HOST_BRIDGE (obj);
@@ -235,8 +235,8 @@ static void i440fx_pcihost_get_pci_hole_end(Object *obj, Visitor *v, }static void i440fx_pcihost_get_pci_hole64_start (Object *obj,Visitor *v, -void *opaque,const char *name, -Error **errp) +const char *name, +void *opaque,Error **errp) {PCIHostState *h =PCI_HOST_BRIDGE (obj);Range w64;
@@ -247,7 +247,7 @@ static void i440fx_pcihost_get_pci_hole64_start(Object *obj, Visitor *v, }static void i440fx_pcihost_get_pci_hole64_end (Object *obj,Visitor *v, -void *opaque,const char *name, +const char *name,void *opaque,Error **errp) {PCIHostState *h =PCI_HOST_BRIDGE (obj);
hw/pci-host/q35.c +6 -7
@@ -67,7 +67,7 @@ static const char *q35_host_root_bus_path(PCIHostState *host_bridge, }static void q35_host_get_pci_hole_start (Object *obj,Visitor *v, -void *opaque,const char *name, +const char *name,void *opaque,Error **errp) {Q35PCIHost *s =Q35_HOST_DEVICE (obj);
@@ -77,7 +77,7 @@ static void q35_host_get_pci_hole_start(Object *obj, Visitor *v, }static void q35_host_get_pci_hole_end (Object *obj,Visitor *v, -void *opaque,const char *name, +const char *name,void *opaque,Error **errp) {Q35PCIHost *s =Q35_HOST_DEVICE (obj);
@@ -87,7 +87,7 @@ static void q35_host_get_pci_hole_end(Object *obj, Visitor *v, }static void q35_host_get_pci_hole64_start (Object *obj,Visitor *v, -void *opaque,const char *name, +const char *name,void *opaque,Error **errp) {PCIHostState *h =PCI_HOST_BRIDGE (obj);
@@ -99,7 +99,7 @@ static void q35_host_get_pci_hole64_start(Object *obj, Visitor *v, }static void q35_host_get_pci_hole64_end (Object *obj,Visitor *v, -void *opaque,const char *name, +const char *name,void *opaque,Error **errp) {PCIHostState *h =PCI_HOST_BRIDGE (obj);
@@ -110,9 +110,8 @@ static void q35_host_get_pci_hole64_end(Object *obj, Visitor *v,visit_type_uint64 (v, name, &w64.end, errp); } -static void q35_host_get_mmcfg_size (Object *obj,Visitor *v, -void *opaque,const char *name, -Error **errp) +static void q35_host_get_mmcfg_size (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {PCIExpressHost *e =PCIE_HOST_BRIDGE (obj);uint32_t value = e->size;
hw/ppc/spapr_drc.c +8 -8
@@ -214,8 +214,8 @@ static uint32_t entity_sense(sPAPRDRConnector *drc, sPAPRDREntitySense *state)return RTAS_OUT_SUCCESS ; } -static void prop_get_index (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void prop_get_index (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {sPAPRDRConnector *drc =SPAPR_DR_CONNECTOR (obj);sPAPRDRConnectorClass *drck =SPAPR_DR_CONNECTOR_GET_CLASS (drc);
@@ -223,8 +223,8 @@ static void prop_get_index(Object *obj, Visitor *v, void *opaque,visit_type_uint32 (v, name, &value, errp); } -static void prop_get_type (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void prop_get_type (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {sPAPRDRConnector *drc =SPAPR_DR_CONNECTOR (obj);sPAPRDRConnectorClass *drck =SPAPR_DR_CONNECTOR_GET_CLASS (drc);
@@ -239,8 +239,8 @@ static char *prop_get_name(Object *obj, Error **errp)return g_strdup (drck->get_name (drc)); } -static void prop_get_entity_sense (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void prop_get_entity_sense (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {sPAPRDRConnector *drc =SPAPR_DR_CONNECTOR (obj);sPAPRDRConnectorClass *drck =SPAPR_DR_CONNECTOR_GET_CLASS (drc);
@@ -250,8 +250,8 @@ static void prop_get_entity_sense(Object *obj, Visitor *v, void *opaque,visit_type_uint32 (v, name, &value, errp); } -static void prop_get_fdt (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void prop_get_fdt (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {sPAPRDRConnector *drc =SPAPR_DR_CONNECTOR (obj);Error *err =NULL ;
hw/usb/dev-storage.c +4 -4
@@ -780,8 +780,8 @@ static void usb_msd_class_initfn_storage(ObjectClass *klass, void *data) dc->props = msd_properties; } -static void usb_msd_get_bootindex (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void usb_msd_get_bootindex (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {USBDevice *dev =USB_DEVICE (obj);MSDState *s =USB_STORAGE_DEV (dev);
@@ -789,8 +789,8 @@ static void usb_msd_get_bootindex(Object *obj, Visitor *v, void *opaque,visit_type_int32 (v, name, &s->conf.bootindex, errp); } -static void usb_msd_set_bootindex (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void usb_msd_set_bootindex (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {USBDevice *dev =USB_DEVICE (obj);MSDState *s =USB_STORAGE_DEV (dev);
hw/virtio/virtio-balloon.c +4 -4
@@ -110,8 +110,8 @@ static void balloon_stats_poll_cb(void *opaque)virtio_notify (vdev, s->svq); } -static void balloon_stats_get_all (Object *obj,Visitor *v, -void *opaque,const char *name,Error **errp) +static void balloon_stats_get_all (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {Error *err =NULL ;VirtIOBalloon *s = opaque;
@@ -149,7 +149,7 @@ out: }static void balloon_stats_get_poll_interval (Object *obj,Visitor *v, -void *opaque,const char *name, +const char *name,void *opaque,Error **errp) {VirtIOBalloon *s = opaque;
@@ -157,7 +157,7 @@ static void balloon_stats_get_poll_interval(Object *obj, Visitor *v, }static void balloon_stats_set_poll_interval (Object *obj,Visitor *v, -void *opaque,const char *name, +const char *name,void *opaque,Error **errp) {VirtIOBalloon *s = opaque;
memory.c +10 -8
@@ -928,8 +928,8 @@ void memory_region_init(MemoryRegion *mr, } } -static void memory_region_get_addr (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void memory_region_get_addr (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {MemoryRegion *mr =MEMORY_REGION (obj);uint64_t value = mr->addr;
@@ -937,8 +937,9 @@ static void memory_region_get_addr(Object *obj, Visitor *v, void *opaque,visit_type_uint64 (v, name, &value, errp); } -static void memory_region_get_container (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void memory_region_get_container (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) {MemoryRegion *mr =MEMORY_REGION (obj);gchar *path = (gchar *)"" ;
@@ -960,8 +961,9 @@ static Object *memory_region_resolve_container(Object *obj, void *opaque,return OBJECT (mr->container); } -static void memory_region_get_priority (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void memory_region_get_priority (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) {MemoryRegion *mr =MEMORY_REGION (obj);int32_t value = mr->priority;
@@ -976,8 +978,8 @@ static bool memory_region_get_may_overlap(Object *obj, Error **errp)return mr->may_overlap; } -static void memory_region_get_size (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void memory_region_get_size (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {MemoryRegion *mr =MEMORY_REGION (obj);uint64_t value =memory_region_size (mr);
net/dump.c +4 -4
@@ -271,8 +271,8 @@ static void filter_dump_setup(NetFilterState *nf, Error **errp)net_dump_state_init (&nfds->ds, nfds->filename, nfds->maxlen, errp); } -static void filter_dump_get_maxlen (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void filter_dump_get_maxlen (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {NetFilterDumpState *nfds =FILTER_DUMP (obj);uint32_t value = nfds->maxlen;
@@ -280,8 +280,8 @@ static void filter_dump_get_maxlen(Object *obj, Visitor *v, void *opaque,visit_type_uint32 (v, name, &value, errp); } -static void filter_dump_set_maxlen (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void filter_dump_set_maxlen (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {NetFilterDumpState *nfds =FILTER_DUMP (obj);Error *local_err =NULL ;
net/filter-buffer.c +6 -4
@@ -132,8 +132,9 @@ static void filter_buffer_class_init(ObjectClass *oc, void *data) nfc->receive_iov = filter_buffer_receive_iov; } -static void filter_buffer_get_interval (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void filter_buffer_get_interval (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) {FilterBufferState *s =FILTER_BUFFER (obj);uint32_t value = s->interval;
@@ -141,8 +142,9 @@ static void filter_buffer_get_interval(Object *obj, Visitor *v, void *opaque,visit_type_uint32 (v, name, &value, errp); } -static void filter_buffer_set_interval (Object *obj,Visitor *v,void *opaque, -const char *name,Error **errp) +static void filter_buffer_set_interval (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) {FilterBufferState *s =FILTER_BUFFER (obj);Error *local_err =NULL ;
qom/object.c +37 -38
180 lines not on this page · raw message
target-i386/cpu.c +33 -34
157 lines not on this page · raw message
target-ppc/translate_init.c +4 -4
@@ -8034,8 +8034,8 @@ POWERPC_FAMILY(POWER5P)(ObjectClass *oc, void *data) pcc->l1_icache_size =0x10000 ; } -static void powerpc_get_compat (Object *obj,Visitor *v, -void *opaque,const char *name,Error **errp) +static void powerpc_get_compat (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {char *value = (char *)"" ;Property *prop = opaque;
@@ -8062,8 +8062,8 @@ static void powerpc_get_compat(Object *obj, Visitor *v,visit_type_str (v, name, &value, errp); } -static void powerpc_set_compat (Object *obj,Visitor *v, -void *opaque,const char *name,Error **errp) +static void powerpc_set_compat (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {Error *error =NULL ;char *value =NULL ;
tests/test-qdev-global-props.c +4 -10
@@ -116,22 +116,16 @@ static void test_static_globalprop(void)#define TYPE_UNUSED_HOTPLUG "hotplug-type"#define TYPE_UNUSED_NOHOTPLUG "nohotplug-type" -static void prop1_accessor (Object *obj, -Visitor *v, -void *opaque, -const char *name, -Error **errp) +static void prop1_accessor (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {MyType *mt =DYNAMIC_TYPE (obj);visit_type_uint32 (v, name, &mt->prop1, errp); } -static void prop2_accessor (Object *obj, -Visitor *v, -void *opaque, -const char *name, -Error **errp) +static void prop2_accessor (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) {MyType *mt =DYNAMIC_TYPE (obj);
Signature · 1 line
2.5.0
PATCH v10 20/25 qapi: Swap 'name' in visit_* callbacks to match public API
In reply to Eric BlakeAs explained in the previous patches, matching argument order of 'name, &value' to JSON's "name":value makes sense. However, while the last two patches were easy with Coccinelle, I ended up doing this one all by hand. Now all the visitor callbacks match the main interface.
The compiler is able to enforce that all clients match the changed interface in visitor-impl.h, even where two pointers are being swapped, because only one of the two pointers is const (if that were not the case, then C's looseness on treating 'char *' like 'void *' would have made review a bit harder).
---
v10: enhance commit message, tweak spacing of 'const char *const'
v9: no change
v8: new patch
--- include/qapi/visitor-impl.h | 39 +++++++++++++++++++++------------------ qapi/qapi-visit-core.c | 38 +++++++++++++++++++------------------- qapi/opts-visitor.c | 16 ++++++++-------- qapi/qapi-dealloc-visitor.c | 25 ++++++++++++------------- qapi/qmp-input-visitor.c | 22 +++++++++++----------- qapi/qmp-output-visitor.c | 16 ++++++++-------- qapi/string-input-visitor.c | 16 ++++++++-------- qapi/string-output-visitor.c | 16 ++++++++-------- 8 files changed, 95 insertions(+), 93 deletions(-)
include/qapi/visitor-impl.h +21 -18
@@ -18,8 +18,8 @@struct Visitor {/* Must be set */ -void (*start_struct)(Visitor *v,void **obj,const char *kind, -const char *name,size_t size,Error **errp); +void (*start_struct)(Visitor *v,const char *name,void **obj, +const char *kind,size_t size,Error **errp);void (*end_struct)(Visitor *v,Error **errp); void (*start_implicit_struct)(Visitor *v, void **obj, size_t size,
@@ -30,38 +30,41 @@ struct Visitor GenericList *(*next_list)(Visitor *v, GenericList **list, Error **errp);void (*end_list)(Visitor *v,Error **errp); -void (*type_enum)(Visitor *v,int *obj,const char *const strings[], -const char *kind,const char *name,Error **errp); +void (*type_enum)(Visitor *v,const char *name,int *obj, +const char *const strings[],const char *kind, +Error **errp);/* May be NULL; only needed for input visitors. */ -void (*get_next_type)(Visitor *v,QType *type,bool promote_int, -const char *name,Error **errp); +void (*get_next_type)(Visitor *v,const char *name,QType *type, +bool promote_int,Error **errp);/* Must be set. */ -void (*type_int64)(Visitor *v,int64_t *obj,const char *name, +void (*type_int64)(Visitor *v,const char *name,int64_t *obj,Error **errp);/* Must be set. */ -void (*type_uint64)(Visitor *v,uint64_t *obj,const char *name, +void (*type_uint64)(Visitor *v,const char *name,uint64_t *obj,Error **errp);/* Optional; fallback is type_uint64(). */ -void (*type_size)(Visitor *v,uint64_t *obj,const char *name, +void (*type_size)(Visitor *v,const char *name,uint64_t *obj,Error **errp);/* Must be set. */ -void (*type_bool)(Visitor *v,bool *obj,const char *name,Error **errp); -void (*type_str)(Visitor *v,char **obj,const char *name,Error **errp); -void (*type_number)(Visitor *v,double *obj,const char *name, +void (*type_bool)(Visitor *v,const char *name,bool *obj,Error **errp); +void (*type_str)(Visitor *v,const char *name,char **obj,Error **errp); +void (*type_number)(Visitor *v,const char *name,double *obj,Error **errp); -void (*type_any)(Visitor *v,QObject **obj,const char *name, +void (*type_any)(Visitor *v,const char *name,QObject **obj,Error **errp);/* May be NULL; most useful for input visitors. */ -void (*optional)(Visitor *v,bool *present,const char *name); +void (*optional)(Visitor *v,const char *name,bool *present); bool (*start_union)(Visitor *v, bool data_present, Error **errp); }; -void input_type_enum (Visitor *v,int *obj,const char *const strings[], -const char *kind,const char *name,Error **errp); -void output_type_enum (Visitor *v,int *obj,const char *const strings[], -const char *kind,const char *name,Error **errp); +void input_type_enum (Visitor *v,const char *name,int *obj, +const char *const strings[],const char *kind, +Error **errp); +void output_type_enum (Visitor *v,const char *name,int *obj, +const char *const strings[],const char *kind, +Error **errp);#endif
qapi/qapi-visit-core.c +19 -19
@@ -21,7 +21,7 @@void visit_start_struct (Visitor *v,const char *name,void **obj,const char *kind,size_t size,Error **errp) { - v->start_struct (v, obj, kind, name, size, errp); + v->start_struct (v, name, obj, kind, size, errp); }void visit_end_struct (Visitor *v,Error **errp)
@@ -70,7 +70,7 @@ bool visit_start_union(Visitor *v, bool data_present, Error **errp)bool visit_optional (Visitor *v,const char *name,bool *present) {if (v->optional) { - v->optional (v, present, name); + v->optional (v, name, present); }return *present; }
@@ -79,7 +79,7 @@ void visit_get_next_type(Visitor *v, const char *name, QType *type, bool promote_int, Error **errp) {if (v->get_next_type) { - v->get_next_type (v, type, promote_int, name, errp); + v->get_next_type (v, name, type, promote_int, errp); } }
@@ -87,12 +87,12 @@ void visit_type_enum(Visitor *v, const char *name, int *obj, const char *const strings[], const char *kind, Error **errp) { - v->type_enum(v, obj, strings, kind, name, errp); + v->type_enum(v, name, obj, strings, kind, errp); }void visit_type_int (Visitor *v,const char *name,int64_t *obj,Error **errp) { - v->type_int64 (v, obj, name, errp); + v->type_int64 (v, name, obj, errp); } static void visit_type_uintN(Visitor *v, uint64_t *obj, const char *name,
@@ -101,7 +101,7 @@ static void visit_type_uintN(Visitor *v, uint64_t *obj, const char *name,Error *err =NULL ;uint64_t value = *obj; - v->type_uint64 (v, &value, name, &err); + v->type_uint64 (v, name, &value, &err);if (err) {error_propagate (errp, err); }else if (value > max) {
@@ -139,7 +139,7 @@ void visit_type_uint32(Visitor *v, const char *name, uint32_t *obj,void visit_type_uint64 (Visitor *v,const char *name,uint64_t *obj,Error **errp) { - v->type_uint64 (v, obj, name, errp); + v->type_uint64 (v, name, obj, errp); } static void visit_type_intN(Visitor *v, int64_t *obj, const char *name,
@@ -149,7 +149,7 @@ static void visit_type_intN(Visitor *v, int64_t *obj, const char *name,Error *err =NULL ;int64_t value = *obj; - v->type_int64 (v, &value, name, &err); + v->type_int64 (v, name, &value, &err);if (err) {error_propagate (errp, err); }else if (value < min || value > max) {
@@ -186,42 +186,42 @@ void visit_type_int32(Visitor *v, const char *name, int32_t *obj,void visit_type_int64 (Visitor *v,const char *name,int64_t *obj,Error **errp) { - v->type_int64 (v, obj, name, errp); + v->type_int64 (v, name, obj, errp); }void visit_type_size (Visitor *v,const char *name,uint64_t *obj,Error **errp) {if (v->type_size) { - v->type_size (v, obj, name, errp); + v->type_size (v, name, obj, errp); }else { - v->type_uint64 (v, obj, name, errp); + v->type_uint64 (v, name, obj, errp); } }void visit_type_bool (Visitor *v,const char *name,bool *obj,Error **errp) { - v->type_bool (v, obj, name, errp); + v->type_bool (v, name, obj, errp); }void visit_type_str (Visitor *v,const char *name,char **obj,Error **errp) { - v->type_str (v, obj, name, errp); + v->type_str (v, name, obj, errp); }void visit_type_number (Visitor *v,const char *name,double *obj,Error **errp) { - v->type_number (v, obj, name, errp); + v->type_number (v, name, obj, errp); }void visit_type_any (Visitor *v,const char *name,QObject **obj,Error **errp) { - v->type_any (v, obj, name, errp); + v->type_any (v, name, obj, errp); } -void output_type_enum (Visitor *v,int *obj,const char *const strings[], -const char *kind,const char *name, +void output_type_enum (Visitor *v,const char *name,int *obj, +const char *const strings[],const char *kind,Error **errp) {int i =0 ;
@@ -239,8 +239,8 @@ void output_type_enum(Visitor *v, int *obj, const char * const strings[],visit_type_str (v, name, &enum_str, errp); } -void input_type_enum (Visitor *v,int *obj,const char *const strings[], -const char *kind,const char *name, +void input_type_enum (Visitor *v,const char *name,int *obj, +const char *const strings[],const char *kind,Error **errp) {Error *local_err =NULL ;
qapi/opts-visitor.c +8 -8
@@ -124,8 +124,8 @@ opts_visitor_insert(GHashTable *unprocessed_opts, const QemuOpt *opt)static void -opts_start_struct (Visitor *v,void **obj,const char *kind, -const char *name,size_t size,Error **errp) +opts_start_struct (Visitor *v,const char *name,void **obj,const char *kind, +size_t size,Error **errp) {OptsVisitor *ov =to_ov (v);const QemuOpt *opt;
@@ -311,7 +311,7 @@ processed(OptsVisitor *ov, const char *name)static void -opts_type_str (Visitor *v,char **obj,const char *name,Error **errp) +opts_type_str (Visitor *v,const char *name,char **obj,Error **errp) {OptsVisitor *ov =to_ov (v);const QemuOpt *opt;
@@ -327,7 +327,7 @@ opts_type_str(Visitor *v, char **obj, const char *name, Error **errp)/* mimics qemu-option.c::parse_option_bool() */ static void -opts_type_bool (Visitor *v,bool *obj,const char *name,Error **errp) +opts_type_bool (Visitor *v,const char *name,bool *obj,Error **errp) {OptsVisitor *ov =to_ov (v);const QemuOpt *opt;
@@ -360,7 +360,7 @@ opts_type_bool(Visitor *v, bool *obj, const char *name, Error **errp)static void -opts_type_int64 (Visitor *v,int64_t *obj,const char *name,Error **errp) +opts_type_int64 (Visitor *v,const char *name,int64_t *obj,Error **errp) {OptsVisitor *ov =to_ov (v);const QemuOpt *opt;
@@ -416,7 +416,7 @@ opts_type_int64(Visitor *v, int64_t *obj, const char *name, Error **errp)static void -opts_type_uint64 (Visitor *v,uint64_t *obj,const char *name,Error **errp) +opts_type_uint64 (Visitor *v,const char *name,uint64_t *obj,Error **errp) {OptsVisitor *ov =to_ov (v);const QemuOpt *opt;
@@ -468,7 +468,7 @@ opts_type_uint64(Visitor *v, uint64_t *obj, const char *name, Error **errp)static void -opts_type_size (Visitor *v,uint64_t *obj,const char *name,Error **errp) +opts_type_size (Visitor *v,const char *name,uint64_t *obj,Error **errp) {OptsVisitor *ov =to_ov (v);const QemuOpt *opt;
@@ -494,7 +494,7 @@ opts_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp)static void -opts_optional (Visitor *v,bool *present,const char *name) +opts_optional (Visitor *v,const char *name,bool *present) {OptsVisitor *ov =to_ov (v);
qapi/qapi-dealloc-visitor.c +12 -13
@@ -58,8 +58,8 @@ static void *qapi_dealloc_pop(QapiDeallocVisitor *qov)return value; } -static void qapi_dealloc_start_struct (Visitor *v,void **obj,const char *kind, -const char *name,size_t unused, +static void qapi_dealloc_start_struct (Visitor *v,const char *name,void **obj, +const char *kind,size_t unused,Error **errp) {QapiDeallocVisitor *qov =to_qov (v);
@@ -127,7 +127,7 @@ static void qapi_dealloc_end_list(Visitor *v, Error **errp)assert (obj ==NULL );/* should've been list head tracker with no payload */ } -static void qapi_dealloc_type_str (Visitor *v,char **obj,const char *name, +static void qapi_dealloc_type_str (Visitor *v,const char *name,char **obj,Error **errp) {if (obj) {
@@ -135,38 +135,37 @@ static void qapi_dealloc_type_str(Visitor *v, char **obj, const char *name, } } -static void qapi_dealloc_type_int64 (Visitor *v,int64_t *obj,const char *name, +static void qapi_dealloc_type_int64 (Visitor *v,const char *name,int64_t *obj,Error **errp) { } -static void qapi_dealloc_type_uint64 (Visitor *v,uint64_t *obj, -const char *name,Error **errp) +static void qapi_dealloc_type_uint64 (Visitor *v,const char *name, +uint64_t *obj,Error **errp) { } -static void qapi_dealloc_type_bool (Visitor *v,bool *obj,const char *name, +static void qapi_dealloc_type_bool (Visitor *v,const char *name,bool *obj,Error **errp) { } -static void qapi_dealloc_type_number (Visitor *v,double *obj,const char *name, +static void qapi_dealloc_type_number (Visitor *v,const char *name,double *obj,Error **errp) { } -static void qapi_dealloc_type_anything (Visitor *v,QObject **obj, -const char *name,Error **errp) +static void qapi_dealloc_type_anything (Visitor *v,const char *name, +QObject **obj,Error **errp) {if (obj) {qobject_decref (*obj); } } -static void qapi_dealloc_type_enum (Visitor *v,int *obj, +static void qapi_dealloc_type_enum (Visitor *v,const char *name,int *obj,const char *const strings[], -const char *kind,const char *name, -Error **errp) +const char *kind,Error **errp) { }
qapi/qmp-input-visitor.c +11 -11
@@ -114,8 +114,8 @@ static void qmp_input_pop(QmpInputVisitor *qiv, Error **errp) qiv->nb_stack--; } -static void qmp_input_start_struct (Visitor *v,void **obj,const char *kind, -const char *name,size_t size,Error **errp) +static void qmp_input_start_struct (Visitor *v,const char *name,void **obj, +const char *kind,size_t size,Error **errp) {QmpInputVisitor *qiv =to_qiv (v);QObject *qobj =qmp_input_get_object (qiv, name, true);
@@ -208,8 +208,8 @@ static void qmp_input_end_list(Visitor *v, Error **errp)qmp_input_pop (qiv, errp); } -static void qmp_input_get_next_type (Visitor *v,QType *type,bool promote_int, -const char *name,Error **errp) +static void qmp_input_get_next_type (Visitor *v,const char *name,QType *type, +bool promote_int,Error **errp) {QmpInputVisitor *qiv =to_qiv (v);QObject *qobj =qmp_input_get_object (qiv, name, false);
@@ -224,7 +224,7 @@ static void qmp_input_get_next_type(Visitor *v, QType *type, bool promote_int, } } -static void qmp_input_type_int64 (Visitor *v,int64_t *obj,const char *name, +static void qmp_input_type_int64 (Visitor *v,const char *name,int64_t *obj,Error **errp) {QmpInputVisitor *qiv =to_qiv (v);
@@ -239,7 +239,7 @@ static void qmp_input_type_int64(Visitor *v, int64_t *obj, const char *name, *obj =qint_get_int (qint); } -static void qmp_input_type_uint64 (Visitor *v,uint64_t *obj,const char *name, +static void qmp_input_type_uint64 (Visitor *v,const char *name,uint64_t *obj,Error **errp) {/* FIXME: qobject_to_qint mishandles values over INT64_MAX */
@@ -255,7 +255,7 @@ static void qmp_input_type_uint64(Visitor *v, uint64_t *obj, const char *name, *obj =qint_get_int (qint); } -static void qmp_input_type_bool (Visitor *v,bool *obj,const char *name, +static void qmp_input_type_bool (Visitor *v,const char *name,bool *obj,Error **errp) {QmpInputVisitor *qiv =to_qiv (v);
@@ -270,7 +270,7 @@ static void qmp_input_type_bool(Visitor *v, bool *obj, const char *name, *obj =qbool_get_bool (qbool); } -static void qmp_input_type_str (Visitor *v,char **obj,const char *name, +static void qmp_input_type_str (Visitor *v,const char *name,char **obj,Error **errp) {QmpInputVisitor *qiv =to_qiv (v);
@@ -285,7 +285,7 @@ static void qmp_input_type_str(Visitor *v, char **obj, const char *name, *obj =g_strdup (qstring_get_str (qstr)); } -static void qmp_input_type_number (Visitor *v,double *obj,const char *name, +static void qmp_input_type_number (Visitor *v,const char *name,double *obj,Error **errp) {QmpInputVisitor *qiv =to_qiv (v);
@@ -309,7 +309,7 @@ static void qmp_input_type_number(Visitor *v, double *obj, const char *name, "number"); } -static void qmp_input_type_any (Visitor *v,QObject **obj,const char *name, +static void qmp_input_type_any (Visitor *v,const char *name,QObject **obj,Error **errp) {QmpInputVisitor *qiv =to_qiv (v);
@@ -319,7 +319,7 @@ static void qmp_input_type_any(Visitor *v, QObject **obj, const char *name, *obj = qobj; } -static void qmp_input_optional (Visitor *v,bool *present,const char *name) +static void qmp_input_optional (Visitor *v,const char *name,bool *present) {QmpInputVisitor *qiv =to_qiv (v);QObject *qobj =qmp_input_get_object (qiv, name, true);
qapi/qmp-output-visitor.c +8 -8
@@ -110,8 +110,8 @@ static void qmp_output_add_obj(QmpOutputVisitor *qov, const char *name, } } -static void qmp_output_start_struct (Visitor *v,void **obj,const char *kind, -const char *name,size_t unused, +static void qmp_output_start_struct (Visitor *v,const char *name,void **obj, +const char *kind,size_t unused,Error **errp) {QmpOutputVisitor *qov =to_qov (v);
@@ -158,14 +158,14 @@ static void qmp_output_end_list(Visitor *v, Error **errp)qmp_output_pop (qov); } -static void qmp_output_type_int64 (Visitor *v,int64_t *obj,const char *name, +static void qmp_output_type_int64 (Visitor *v,const char *name,int64_t *obj,Error **errp) {QmpOutputVisitor *qov =to_qov (v);qmp_output_add (qov, name,qint_from_int (*obj)); } -static void qmp_output_type_uint64 (Visitor *v,uint64_t *obj,const char *name, +static void qmp_output_type_uint64 (Visitor *v,const char *name,uint64_t *obj,Error **errp) {/* FIXME: QMP outputs values larger than INT64_MAX as negative */
@@ -173,14 +173,14 @@ static void qmp_output_type_uint64(Visitor *v, uint64_t *obj, const char *name,qmp_output_add (qov, name,qint_from_int (*obj)); } -static void qmp_output_type_bool (Visitor *v,bool *obj,const char *name, +static void qmp_output_type_bool (Visitor *v,const char *name,bool *obj,Error **errp) {QmpOutputVisitor *qov =to_qov (v);qmp_output_add (qov, name,qbool_from_bool (*obj)); } -static void qmp_output_type_str (Visitor *v,char **obj,const char *name, +static void qmp_output_type_str (Visitor *v,const char *name,char **obj,Error **errp) {QmpOutputVisitor *qov =to_qov (v);
@@ -191,14 +191,14 @@ static void qmp_output_type_str(Visitor *v, char **obj, const char *name, } } -static void qmp_output_type_number (Visitor *v,double *obj,const char *name, +static void qmp_output_type_number (Visitor *v,const char *name,double *obj,Error **errp) {QmpOutputVisitor *qov =to_qov (v);qmp_output_add (qov, name,qfloat_from_double (*obj)); } -static void qmp_output_type_any (Visitor *v,QObject **obj,const char *name, +static void qmp_output_type_any (Visitor *v,const char *name,QObject **obj,Error **errp) {QmpOutputVisitor *qov =to_qov (v);
qapi/string-input-visitor.c +8 -8
@@ -184,7 +184,7 @@ end_list(Visitor *v, Error **errp) siv->head = true; } -static void parse_type_int64 (Visitor *v,int64_t *obj,const char *name, +static void parse_type_int64 (Visitor *v,const char *name,int64_t *obj,Error **errp) {StringInputVisitor *siv =to_siv (v);
@@ -226,13 +226,13 @@ error: "an int64 value or range"); } -static void parse_type_uint64 (Visitor *v,uint64_t *obj,const char *name, +static void parse_type_uint64 (Visitor *v,const char *name,uint64_t *obj,Error **errp) {/* FIXME: parse_type_int64 mishandles values over INT64_MAX */ int64_t i;Error *err =NULL ; -parse_type_int64 (v, &i, name, &err); +parse_type_int64 (v, name, &i, &err);if (err) {error_propagate (errp, err); }else {
@@ -240,7 +240,7 @@ static void parse_type_uint64(Visitor *v, uint64_t *obj, const char *name, } } -static void parse_type_size (Visitor *v,uint64_t *obj,const char *name, +static void parse_type_size (Visitor *v,const char *name,uint64_t *obj,Error **errp) {StringInputVisitor *siv =to_siv (v);
@@ -262,7 +262,7 @@ static void parse_type_size(Visitor *v, uint64_t *obj, const char *name, *obj = val; } -static void parse_type_bool (Visitor *v,bool *obj,const char *name, +static void parse_type_bool (Visitor *v,const char *name,bool *obj,Error **errp) {StringInputVisitor *siv =to_siv (v);
@@ -286,7 +286,7 @@ static void parse_type_bool(Visitor *v, bool *obj, const char *name, "boolean"); } -static void parse_type_str (Visitor *v,char **obj,const char *name, +static void parse_type_str (Visitor *v,const char *name,char **obj,Error **errp) {StringInputVisitor *siv =to_siv (v);
@@ -298,7 +298,7 @@ static void parse_type_str(Visitor *v, char **obj, const char *name, } } -static void parse_type_number (Visitor *v,double *obj,const char *name, +static void parse_type_number (Visitor *v,const char *name,double *obj,Error **errp) {StringInputVisitor *siv =to_siv (v);
@@ -318,7 +318,7 @@ static void parse_type_number(Visitor *v, double *obj, const char *name, *obj = val; } -static void parse_optional (Visitor *v,bool *present,const char *name) +static void parse_optional (Visitor *v,const char *name,bool *present) {StringInputVisitor *siv =to_siv (v);
qapi/string-output-visitor.c +8 -8
@@ -121,7 +121,7 @@ static void format_string(StringOutputVisitor *sov, Range *r, bool next, } } -static void print_type_int64 (Visitor *v,int64_t *obj,const char *name, +static void print_type_int64 (Visitor *v,const char *name,int64_t *obj,Error **errp) {StringOutputVisitor *sov =to_sov (v);
@@ -197,16 +197,16 @@ static void print_type_int64(Visitor *v, int64_t *obj, const char *name, } } -static void print_type_uint64 (Visitor *v,uint64_t *obj,const char *name, +static void print_type_uint64 (Visitor *v,const char *name,uint64_t *obj,Error **errp) {/* FIXME: print_type_int64 mishandles values over INT64_MAX */ int64_t i = *obj; -print_type_int64 (v, &i, name, errp); +print_type_int64 (v, name, &i, errp); } -static void print_type_size (Visitor *v,uint64_t *obj,const char *name, -Error **errp) +static void print_type_size (Visitor *v,const char *name,uint64_t *obj, +Error **errp) {StringOutputVisitor *sov =to_sov (v);static const char suffixes[] = {'B' ,'K' ,'M' ,'G' ,'T' ,'P' ,'E' };
@@ -236,14 +236,14 @@ static void print_type_size(Visitor *v, uint64_t *obj, const char *name,string_output_set (sov, out); } -static void print_type_bool (Visitor *v,bool *obj,const char *name, +static void print_type_bool (Visitor *v,const char *name,bool *obj,Error **errp) {StringOutputVisitor *sov =to_sov (v);string_output_set (sov,g_strdup (*obj ?"true" :"false" )); } -static void print_type_str (Visitor *v,char **obj,const char *name, +static void print_type_str (Visitor *v,const char *name,char **obj,Error **errp) {StringOutputVisitor *sov =to_sov (v);
@@ -257,7 +257,7 @@ static void print_type_str(Visitor *v, char **obj, const char *name,string_output_set (sov, out); } -static void print_type_number (Visitor *v,double *obj,const char *name, +static void print_type_number (Visitor *v,const char *name,double *obj,Error **errp) {StringOutputVisitor *sov =to_sov (v);
Signature · 1 line
2.5.0
PATCH v10 21/25 qapi: Drop unused 'kind' for struct/enum visit
In reply to Eric Blakevisit_start_struct() and visit_type_enum() had a 'kind' argument that was usually set to either the stringized version of the corresponding qapi type name, or to NULL (although some clients didn't even get that right). But nothing ever used the argument. It's even hard to argue that it would be useful in a debugger, as a stack backtrace also tells which type is being visited.
Therefore, drop the 'kind' argument as dead.
---
v10: rebase to earlier changes, tweak copyright
v9: no change
v8: rebase to 'name' motion
v7: new patch
--- include/qapi/visitor.h | 5 ++--- include/qapi/visitor-impl.h | 11 ++++------- scripts/qapi-event.py | 2 +- scripts/qapi-visit.py | 12 ++++++------ qapi/qapi-visit-core.c | 16 +++++++--------- hmp.c | 2 +- hw/core/qdev-properties.c | 6 ++---- hw/ppc/spapr_drc.c | 4 ++-- hw/virtio/virtio-balloon.c | 4 ++-- qapi/opts-visitor.c | 2 +- qapi/qapi-dealloc-visitor.c | 6 ++---- qapi/qmp-input-visitor.c | 2 +- qapi/qmp-output-visitor.c | 3 +-- qom/object.c | 8 ++++---- vl.c | 2 +- 15 files changed, 37 insertions(+), 48 deletions(-)
include/qapi/visitor.h +2 -3
@@ -28,7 +28,7 @@ typedef struct GenericList } GenericList;void visit_start_struct (Visitor *v,const char *name,void **obj, -const char *kind,size_t size,Error **errp); +size_t size,Error **errp);void visit_end_struct (Visitor *v,Error **errp);void visit_start_implicit_struct (Visitor *v,void **obj,size_t size,Error **errp);
@@ -54,8 +54,7 @@ bool visit_optional(Visitor *v, const char *name, bool *present);void visit_get_next_type (Visitor *v,const char *name,QType *type,bool promote_int,Error **errp);void visit_type_enum (Visitor *v,const char *name,int *obj, -const char *const strings[],const char *kind, -Error **errp); +const char *const strings[],Error **errp);void visit_type_int (Visitor *v,const char *name,int64_t *obj,Error **errp);void visit_type_uint8 (Visitor *v,const char *name,uint8_t *obj,Error **errp);
include/qapi/visitor-impl.h +4 -7
@@ -19,7 +19,7 @@ struct Visitor {/* Must be set */ void (*start_struct)(Visitor *v,const char *name,void **obj, -const char *kind,size_t size,Error **errp); +size_t size,Error **errp);void (*end_struct)(Visitor *v,Error **errp); void (*start_implicit_struct)(Visitor *v, void **obj, size_t size,
@@ -31,8 +31,7 @@ struct Visitorvoid (*end_list)(Visitor *v,Error **errp);void (*type_enum)(Visitor *v,const char *name,int *obj, -const char *const strings[],const char *kind, -Error **errp); +const char *const strings[],Error **errp);/* May be NULL; only needed for input visitors. */ void (*get_next_type)(Visitor *v,const char *name,QType *type,bool promote_int,Error **errp);
@@ -61,10 +60,8 @@ struct Visitor };void input_type_enum (Visitor *v,const char *name,int *obj, -const char *const strings[],const char *kind, -Error **errp); +const char *const strings[],Error **errp);void output_type_enum (Visitor *v,const char *name,int *obj, -const char *const strings[],const char *kind, -Error **errp); +const char *const strings[],Error **errp);#endif
scripts/qapi-event.py +1 -1
@@ -63,7 +63,7 @@ def gen_event_send(name, arg_type): qov = qmp_output_visitor_new(); v = qmp_output_get_visitor(qov); - visit_start_struct(v, "%(name)s", NULL, NULL, 0, &err); + visit_start_struct(v, "%(name)s", NULL, 0, &err); ''', name=name) ret += gen_err_check()
scripts/qapi-visit.py +6 -6
@@ -122,7 +122,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error { Error *err = NULL; - visit_start_struct(v, name, (void **)obj, "%(name)s", sizeof(%(c_name)s), &err); + visit_start_struct(v, name, (void **)obj, sizeof(%(c_name)s), &err); if (err) { goto out; }
@@ -138,7 +138,7 @@ out: error_propagate(errp, err); } ''', - name=name, c_name=c_name(name)) + c_name=c_name(name)) return ret
@@ -183,11 +183,11 @@ def gen_visit_enum(name): void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s *obj, Error **errp) { int value = *obj; - visit_type_enum(v, name, &value, %(c_name)s_lookup, "%(name)s", errp); + visit_type_enum(v, name, &value, %(c_name)s_lookup, errp); *obj = value; } ''', - c_name=c_name(name), name=name) + c_name=c_name(name)) def gen_visit_alternate(name, variants):
@@ -259,7 +259,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error { Error *err = NULL; - visit_start_struct(v, name, (void **)obj, "%(name)s", sizeof(%(c_name)s), &err); + visit_start_struct(v, name, (void **)obj, sizeof(%(c_name)s), &err); if (err) { goto out; }
@@ -267,7 +267,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error goto out_obj; } ''', - c_name=c_name(name), name=name) + c_name=c_name(name)) if base: ret += mcgen('''
qapi/qapi-visit-core.c +7 -9
@@ -3,6 +3,7 @@* * Copyright (C) 2012-2016 Red Hat, Inc. * Copyright IBM, Corp. 2011 +* Copyright (C) 2015 Red Hat, Inc. * * Authors: * Anthony Liguori <[email protected]>
@@ -19,9 +20,9 @@#include "qapi/visitor-impl.h" void visit_start_struct (Visitor *v,const char *name,void **obj, -const char *kind,size_t size,Error **errp) +size_t size,Error **errp) { - v->start_struct (v, name, obj, kind, size, errp); + v->start_struct (v, name, obj, size, errp); }void visit_end_struct (Visitor *v,Error **errp)
@@ -84,10 +85,9 @@ void visit_get_next_type(Visitor *v, const char *name, QType *type, }void visit_type_enum (Visitor *v,const char *name,int *obj, -const char *const strings[],const char *kind, -Error **errp) +const char *const strings[],Error **errp) { - v->type_enum (v, name, obj, strings, kind, errp); + v->type_enum (v, name, obj, strings, errp); }void visit_type_int (Visitor *v,const char *name,int64_t *obj,Error **errp)
@@ -221,8 +221,7 @@ void visit_type_any(Visitor *v, const char *name, QObject **obj, Error **errp) }void output_type_enum (Visitor *v,const char *name,int *obj, -const char *const strings[],const char *kind, -Error **errp) +const char *const strings[],Error **errp) {int i =0 ;int value = *obj;
@@ -240,8 +239,7 @@ void output_type_enum(Visitor *v, const char *name, int *obj, }void input_type_enum (Visitor *v,const char *name,int *obj, -const char *const strings[],const char *kind, -Error **errp) +const char *const strings[],Error **errp) {Error *local_err =NULL ;int64_t value =0 ;
hmp.c +1 -1
@@ -1669,7 +1669,7 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) pdict =qdict_clone_shallow (qdict); v =opts_get_visitor (ov); -visit_start_struct (v,NULL ,NULL ,NULL ,0 , &err); +visit_start_struct (v,NULL ,NULL ,0 , &err);if (err) { goto out_clean; }
hw/core/qdev-properties.c +2 -4
@@ -48,8 +48,7 @@ static void get_enum(Object *obj, Visitor *v, const char *name, void *opaque,Property *prop = opaque;int *ptr =qdev_get_prop_ptr (dev, prop); -visit_type_enum (v, prop->name, ptr, prop->info->enum_table, - prop->info->name, errp); +visit_type_enum (v, prop->name, ptr, prop->info->enum_table, errp); } static void set_enum(Object *obj, Visitor *v, const char *name, void *opaque,
@@ -64,8 +63,7 @@ static void set_enum(Object *obj, Visitor *v, const char *name, void *opaque,return ; } -visit_type_enum (v, prop->name, ptr, prop->info->enum_table, - prop->info->name, errp); +visit_type_enum (v, prop->name, ptr, prop->info->enum_table, errp); }/* Bit */
hw/ppc/spapr_drc.c +2 -2
@@ -259,7 +259,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, const char *name,void *fdt;if (!drc->fdt) { -visit_start_struct (v, name,NULL ,NULL ,0 , &err); +visit_start_struct (v, name,NULL ,0 , &err);if (!err) {visit_end_struct (v, &err); }
@@ -282,7 +282,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, const char *name,case FDT_BEGIN_NODE : fdt_depth++; name =fdt_get_name (fdt, fdt_offset, &name_len); -visit_start_struct (v, name,NULL ,NULL ,0 , &err); +visit_start_struct (v, name,NULL ,0 , &err);if (err) {error_propagate (errp, err);return ;
hw/virtio/virtio-balloon.c +2 -2
@@ -117,7 +117,7 @@ static void balloon_stats_get_all(Object *obj, Visitor *v, const char *name,VirtIOBalloon *s = opaque;int i; -visit_start_struct (v, name,NULL ,"guest-stats" ,0 , &err); +visit_start_struct (v, name,NULL ,0 , &err);if (err) { goto out; }
@@ -126,7 +126,7 @@ static void balloon_stats_get_all(Object *obj, Visitor *v, const char *name, goto out_end; } -visit_start_struct (v,"stats" ,NULL ,NULL ,0 , &err); +visit_start_struct (v,"stats" ,NULL ,0 , &err);if (err) { goto out_end; }
qapi/opts-visitor.c +1 -1
@@ -124,7 +124,7 @@ opts_visitor_insert(GHashTable *unprocessed_opts, const QemuOpt *opt)static void -opts_start_struct (Visitor *v,const char *name,void **obj,const char *kind, +opts_start_struct (Visitor *v,const char *name,void **obj,size_t size,Error **errp) {OptsVisitor *ov =to_ov (v);
qapi/qapi-dealloc-visitor.c +2 -4
@@ -59,8 +59,7 @@ static void *qapi_dealloc_pop(QapiDeallocVisitor *qov) }static void qapi_dealloc_start_struct (Visitor *v,const char *name,void **obj, -const char *kind,size_t unused, -Error **errp) +size_t unused,Error **errp) {QapiDeallocVisitor *qov =to_qov (v);qapi_dealloc_push (qov, obj);
@@ -164,8 +163,7 @@ static void qapi_dealloc_type_anything(Visitor *v, const char *name, }static void qapi_dealloc_type_enum (Visitor *v,const char *name,int *obj, -const char *const strings[], -const char *kind,Error **errp) +const char *const strings[],Error **errp) { }
qapi/qmp-input-visitor.c +1 -1
@@ -115,7 +115,7 @@ static void qmp_input_pop(QmpInputVisitor *qiv, Error **errp) }static void qmp_input_start_struct (Visitor *v,const char *name,void **obj, -const char *kind,size_t size,Error **errp) +size_t size,Error **errp) {QmpInputVisitor *qiv =to_qiv (v);QObject *qobj =qmp_input_get_object (qiv, name, true);
qapi/qmp-output-visitor.c +1 -2
@@ -111,8 +111,7 @@ static void qmp_output_add_obj(QmpOutputVisitor *qov, const char *name, }static void qmp_output_start_struct (Visitor *v,const char *name,void **obj, -const char *kind,size_t unused, -Error **errp) +size_t unused,Error **errp) {QmpOutputVisitor *qov =to_qov (v);QDict *dict =qdict_new ();
qom/object.c +4 -4
@@ -1244,7 +1244,7 @@ int object_property_get_enum(Object *obj, const char *name, siv =string_input_visitor_new (str);string_output_visitor_cleanup (sov);visit_type_enum (string_input_get_visitor (siv), name, &ret, - enumprop->strings,NULL , errp); + enumprop->strings, errp);g_free (str);string_input_visitor_cleanup (siv);
@@ -1915,7 +1915,7 @@ static void property_get_enum(Object *obj, Visitor *v, const char *name,return ; } -visit_type_enum (v, name, &value, prop->strings,NULL , errp); +visit_type_enum (v, name, &value, prop->strings, errp); } static void property_set_enum(Object *obj, Visitor *v, const char *name,
@@ -1925,7 +1925,7 @@ static void property_set_enum(Object *obj, Visitor *v, const char *name,int value;Error *err =NULL ; -visit_type_enum (v, name, &value, prop->strings,NULL , &err); +visit_type_enum (v, name, &value, prop->strings, &err);if (err) {error_propagate (errp, err);return ;
@@ -2006,7 +2006,7 @@ static void property_get_tm(Object *obj, Visitor *v, const char *name, goto out; } -visit_start_struct (v, name,NULL ,"struct tm" ,0 , &err); +visit_start_struct (v, name,NULL ,0 , &err);if (err) { goto out; }
vl.c +1 -1
@@ -2834,7 +2834,7 @@ static int object_create(void *opaque, QemuOpts *opts, Error **errp) pdict =qemu_opts_to_qdict (opts,NULL ); v =opts_get_visitor (ov); -visit_start_struct (v,NULL ,NULL ,NULL ,0 , &err); +visit_start_struct (v,NULL ,NULL ,0 , &err);if (err) { goto out; }
Signature · 1 line
2.5.0
Re: [Qemu-devel] [PATCH v10 21/25] qapi: Drop unused 'kind' for struct/enum visit
Quoted 17 lines · Eric Blake
visit_start_struct()andvisit_type_enum()had a 'kind' argument that was usually set to either the stringized version of the corresponding qapi type name, or to NULL (although some clients didn't even get that right). But nothing ever used the argument. It's even hard to argue that it would be useful in a debugger, as a stack backtrace also tells which type is being visited.Therefore, drop the 'kind' argument as dead.
Signed-off-by Eric Blake <[email protected]>Reviewed-by Marc-André Lureau <[email protected]>---
v10: rebase to earlier changes, tweak copyright
v9: no change
v8: rebase to 'name' motion
v7: new patch
[...]
qapi/qapi-visit-core.c line 6
Quoted 9 lines
qapi/qapi-visit-core.c +1
-0@@ -3,6 +3,7 @@* * Copyright (C) 2012-2016 Red Hat, Inc. * Copyright IBM, Corp. 2011 +* Copyright (C) 2015 Red Hat, Inc.
Rebase mistake. Can drop the hunk on commit.
Quoted 3 lines
qapi/qapi-visit-core.c +0
-0* * Authors: * Anthony Liguori <[email protected]>
[...]
PATCH v10 22/25 qapi: Tighten qmp_input_end_list()
In reply to Eric BlakeThe only way that qmp_input_pop() will set errp is if a dictionary was the most recent thing pushed. Since we don't have any push(struct)/pop(list) or push(list)/pop(struct) mismatches (such a mismatch is a programming bug), we therefore cannot set errp inside qmp_input_end_list(). Make this obvious by using &error_abort. A later patch will then remove the errp parameter of qmp_input_pop(), but that will first require the larger task of splitting visit_end_struct().
---
v10: new patch, split out from 18/37
--- qapi/qmp-input-visitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
qapi/qmp-input-visitor.c +1 -1
@@ -205,7 +205,7 @@ static void qmp_input_end_list(Visitor *v, Error **errp) {QmpInputVisitor *qiv =to_qiv (v); -qmp_input_pop (qiv, errp); +qmp_input_pop (qiv, &error_abort); } static void qmp_input_get_next_type(Visitor *v, const char *name, QType *type,
Signature · 1 line
2.5.0
PATCH v10 23/25 qapi: Drop unused error argument for list and implicit struct
In reply to Eric BlakeNo backend was setting an error when ending an implicit struct, or when iterating a list. Make the callers a bit easier to follow by making this a part of the contract, and removing the errp argument - callers can then unconditionally end an object as part of cleanup without having to think about whether a second error is dominated by a first, because there is no second error.
A later patch will then tackle the larger task of splitting visit_end_struct(), which can indeed set an error (and that cleanup will also have the side-effect of removing the use of error_abort added here).
---
v10: split out qmp input changes, also fix visit_next_list(), drop R-b
v9: enhance commit message
v8: no change
v7: place earlier in series, rebase to earlier changes
v6: new patch, split from RFC on v5 7/46
--- include/qapi/visitor.h | 8 +++++--- include/qapi/visitor-impl.h | 9 ++++++--- scripts/qapi-visit.py | 12 ++++-------- qapi/qapi-visit-core.c | 12 ++++++------ hw/ppc/spapr_drc.c | 6 +----- qapi/opts-visitor.c | 6 +++--- qapi/qapi-dealloc-visitor.c | 8 ++++---- qapi/qmp-input-visitor.c | 11 +++-------- qapi/qmp-output-visitor.c | 6 +++--- qapi/string-input-visitor.c | 8 +++----- qapi/string-output-visitor.c | 8 +++----- 11 files changed, 41 insertions(+), 53 deletions(-)
include/qapi/visitor.h +5 -3
@@ -1,6 +1,7 @@/* * Core Definitions for QAPI Visitor Classes * +* Copyright (C) 2012-2016 Red Hat, Inc. * Copyright IBM, Corp. 2011 * * Authors:
@@ -32,10 +33,11 @@ void visit_start_struct(Visitor *v, const char *name, void **obj,void visit_end_struct (Visitor *v,Error **errp);void visit_start_implicit_struct (Visitor *v,void **obj,size_t size,Error **errp); -void visit_end_implicit_struct (Visitor *v,Error **errp); +void visit_end_implicit_struct (Visitor *v); +void visit_start_list (Visitor *v,const char *name,Error **errp); -GenericList *visit_next_list (Visitor *v,GenericList **list,Error **errp); -void visit_end_list (Visitor *v,Error **errp); +GenericList *visit_next_list (Visitor *v,GenericList **list); +void visit_end_list (Visitor *v);/** * Check if an optional member @name of an object needs visiting.
include/qapi/visitor-impl.h +6 -3
@@ -24,11 +24,14 @@ struct Visitorvoid (*start_implicit_struct)(Visitor *v,void **obj,size_t size,Error **errp); -void (*end_implicit_struct)(Visitor *v,Error **errp); +/* May be NULL */ +void (*end_implicit_struct)(Visitor *v);void (*start_list)(Visitor *v,const char *name,Error **errp); - GenericList *(*next_list)(Visitor *v, GenericList **list, Error **errp); -void (*end_list)(Visitor *v,Error **errp); +/* Must be set */ + GenericList *(*next_list)(Visitor *v, GenericList **list); +/* Must be set */ +void (*end_list)(Visitor *v);void (*type_enum)(Visitor *v,const char *name,int *obj,const char *const strings[],Error **errp);
scripts/qapi-visit.py +4 -8
@@ -62,7 +62,7 @@ static void visit_type_implicit_%(c_type)s(Visitor *v, %(c_type)s **obj, Error * visit_start_implicit_struct(v, (void **)obj, sizeof(%(c_type)s), &err); if (!err) { visit_type_%(c_type)s_fields(v, obj, errp); - visit_end_implicit_struct(v, &err); + visit_end_implicit_struct(v); } error_propagate(errp, err); }
@@ -161,15 +161,13 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error } for (prev = (GenericList **)obj; - !err && (i = visit_next_list(v, prev, &err)) != NULL; + !err && (i = visit_next_list(v, prev)) != NULL; prev = &i) { %(c_name)s *native_i = (%(c_name)s *)i; visit_type_%(c_elt_type)s(v, NULL, &native_i->value, &err); } - error_propagate(errp, err); - err = NULL; - visit_end_list(v, &err); + visit_end_list(v); out: error_propagate(errp, err); }
@@ -230,9 +228,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error "%(name)s"); } out_obj: - error_propagate(errp, err); - err = NULL; - visit_end_implicit_struct(v, &err); + visit_end_implicit_struct(v); out: error_propagate(errp, err); }
qapi/qapi-visit-core.c +6 -6
@@ -38,10 +38,10 @@ void visit_start_implicit_struct(Visitor *v, void **obj, size_t size, } } -void visit_end_implicit_struct (Visitor *v,Error **errp) +void visit_end_implicit_struct (Visitor *v) {if (v->end_implicit_struct) { - v->end_implicit_struct (v, errp); + v->end_implicit_struct (v); } }
@@ -50,14 +50,14 @@ void visit_start_list(Visitor *v, const char *name, Error **errp) v->start_list (v, name, errp); } -GenericList *visit_next_list (Visitor *v,GenericList **list,Error **errp) +GenericList *visit_next_list (Visitor *v,GenericList **list) { -return v->next_list (v, list, errp); +return v->next_list (v, list); } -void visit_end_list (Visitor *v,Error **errp) +void visit_end_list (Visitor *v) { - v->end_list (v, errp); + v->end_list (v); }bool visit_start_union (Visitor *v,bool data_present,Error **errp)
hw/ppc/spapr_drc.c +1 -5
@@ -314,11 +314,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, const char *name,return ; } } -visit_end_list (v, &err); -if (err) { -error_propagate (errp, err); -return ; - } +visit_end_list (v);break ; }default :
qapi/opts-visitor.c +3 -3
@@ -1,7 +1,7 @@/* * Options Visitor * -* Copyright Red Hat, Inc. 2012, 2013 +* Copyright Red Hat, Inc. 2012-2016 * * Author: Laszlo Ersek <[email protected]> *
@@ -220,7 +220,7 @@ opts_start_list(Visitor *v, const char *name, Error **errp)static GenericList * -opts_next_list (Visitor *v,GenericList **list,Error **errp) +opts_next_list (Visitor *v,GenericList **list) {OptsVisitor *ov =to_ov (v);GenericList **link;
@@ -269,7 +269,7 @@ opts_next_list(Visitor *v, GenericList **list, Error **errp)static void -opts_end_list (Visitor *v,Error **errp) +opts_end_list (Visitor *v) {OptsVisitor *ov =to_ov (v);
qapi/qapi-dealloc-visitor.c +4 -4
@@ -1,6 +1,7 @@/* * Dealloc Visitor * +* Copyright (C) 2012-2016 Red Hat, Inc. * Copyright IBM, Corp. 2011 * * Authors:
@@ -83,7 +84,7 @@ static void qapi_dealloc_start_implicit_struct(Visitor *v,qapi_dealloc_push (qov, obj); } -static void qapi_dealloc_end_implicit_struct (Visitor *v,Error **errp) +static void qapi_dealloc_end_implicit_struct (Visitor *v) {QapiDeallocVisitor *qov =to_qov (v);void **obj =qapi_dealloc_pop (qov);
@@ -98,8 +99,7 @@ static void qapi_dealloc_start_list(Visitor *v, const char *name, Error **errp)qapi_dealloc_push (qov,NULL ); } -static GenericList *qapi_dealloc_next_list (Visitor *v,GenericList **listp, -Error **errp) +static GenericList *qapi_dealloc_next_list (Visitor *v,GenericList **listp) {GenericList *list = *listp;QapiDeallocVisitor *qov =to_qov (v);
@@ -119,7 +119,7 @@ static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp,return NULL ; } -static void qapi_dealloc_end_list (Visitor *v,Error **errp) +static void qapi_dealloc_end_list (Visitor *v) {QapiDeallocVisitor *qov =to_qov (v);void *obj =qapi_dealloc_pop (qov);
qapi/qmp-input-visitor.c +3 -8
@@ -1,6 +1,7 @@/* * Input Visitor * +* Copyright (C) 2012-2016 Red Hat, Inc. * Copyright IBM, Corp. 2011 * * Authors:
@@ -153,10 +154,6 @@ static void qmp_input_start_implicit_struct(Visitor *v, void **obj, } } -static void qmp_input_end_implicit_struct (Visitor *v,Error **errp) -{ -} -static void qmp_input_start_list (Visitor *v,const char *name,Error **errp) {QmpInputVisitor *qiv =to_qiv (v);
@@ -171,8 +168,7 @@ static void qmp_input_start_list(Visitor *v, const char *name, Error **errp)qmp_input_push (qiv, qobj, errp); } -static GenericList *qmp_input_next_list (Visitor *v,GenericList **list, -Error **errp) +static GenericList *qmp_input_next_list (Visitor *v,GenericList **list) {QmpInputVisitor *qiv =to_qiv (v);GenericList *entry;
@@ -201,7 +197,7 @@ static GenericList *qmp_input_next_list(Visitor *v, GenericList **list,return entry; } -static void qmp_input_end_list (Visitor *v,Error **errp) +static void qmp_input_end_list (Visitor *v) {QmpInputVisitor *qiv =to_qiv (v);
@@ -352,7 +348,6 @@ QmpInputVisitor *qmp_input_visitor_new(QObject *obj) v->visitor.start_struct = qmp_input_start_struct; v->visitor.end_struct = qmp_input_end_struct; v->visitor.start_implicit_struct = qmp_input_start_implicit_struct; - v->visitor.end_implicit_struct = qmp_input_end_implicit_struct; v->visitor.start_list = qmp_input_start_list; v->visitor.next_list = qmp_input_next_list; v->visitor.end_list = qmp_input_end_list;
qapi/qmp-output-visitor.c +3 -3
@@ -1,6 +1,7 @@/* * Core Definitions for QAPI/QMP Command Registry * +* Copyright (C) 2012-2016 Red Hat, Inc. * Copyright IBM, Corp. 2011 * * Authors:
@@ -135,8 +136,7 @@ static void qmp_output_start_list(Visitor *v, const char *name, Error **errp)qmp_output_push (qov, list); } -static GenericList *qmp_output_next_list (Visitor *v,GenericList **listp, -Error **errp) +static GenericList *qmp_output_next_list (Visitor *v,GenericList **listp) {GenericList *list = *listp;QmpOutputVisitor *qov =to_qov (v);
@@ -151,7 +151,7 @@ static GenericList *qmp_output_next_list(Visitor *v, GenericList **listp,return list ? list->next :NULL ; } -static void qmp_output_end_list (Visitor *v,Error **errp) +static void qmp_output_end_list (Visitor *v) {QmpOutputVisitor *qov =to_qov (v);qmp_output_pop (qov);
qapi/string-input-visitor.c +3 -5
@@ -1,7 +1,7 @@/* * String parsing visitor * -* Copyright Red Hat, Inc. 2012 +* Copyright Red Hat, Inc. 2012-2016 * * Author: Paolo Bonzini <[email protected]> *
@@ -138,8 +138,7 @@ start_list(Visitor *v, const char *name, Error **errp) } } -static GenericList * -next_list (Visitor *v,GenericList **list,Error **errp) +static GenericList *next_list (Visitor *v,GenericList **list) {StringInputVisitor *siv =to_siv (v);GenericList **link;
@@ -177,8 +176,7 @@ next_list(Visitor *v, GenericList **list, Error **errp)return *link; } -static void -end_list (Visitor *v,Error **errp) +static void end_list (Visitor *v) {StringInputVisitor *siv =to_siv (v); siv->head = true;
qapi/string-output-visitor.c +3 -5
@@ -1,7 +1,7 @@/* * String printing Visitor * -* Copyright Red Hat, Inc. 2012 +* Copyright Red Hat, Inc. 2012-2016 * * Author: Paolo Bonzini <[email protected]> *
@@ -275,8 +275,7 @@ start_list(Visitor *v, const char *name, Error **errp) sov->head = true; } -static GenericList * -next_list (Visitor *v,GenericList **list,Error **errp) +static GenericList *next_list (Visitor *v,GenericList **list) {StringOutputVisitor *sov =to_sov (v);GenericList *ret =NULL ;
@@ -302,8 +301,7 @@ next_list(Visitor *v, GenericList **list, Error **errp)return ret; } -static void -end_list (Visitor *v,Error **errp) +static void end_list (Visitor *v) {StringOutputVisitor *sov =to_sov (v);
Signature · 1 line
2.5.0
Re: [Qemu-devel] [PATCH v10 23/25] qapi: Drop unused error argument for list and implicit struct
Quoted 2 lines · Eric Blake
No backend was setting an error when ending an implicit struct, or when iterating a list.
Perhaps "when ending the visit of a list or implicit struct, or when moving to the next list node" would be more precise. If you like it, I can do that on commit.
Quoted 11 lines
Make the callers a bit easier to follow
by making this a part of the contract, and removing the errp argument - callers can then unconditionally end an object as part of cleanup without having to think about whether a second error is dominated by a first, because there is no second error.A later patch will then tackle the larger task of splitting
visit_end_struct(), which can indeed set an error (and that cleanup will also have the side-effect of removing the use oferror_abortadded here).
Quoted 8 lines
Signed-off-by Eric Blake <[email protected]>---
v10: split out qmp input changes, also fixvisit_next_list(), drop R-b
v9: enhance commit message
v8: no change
v7: place earlier in series, rebase to earlier changes
v6: new patch, split from RFC on v5 7/46
Patch looks good.
Re: [Qemu-devel] [PATCH v10 23/25] qapi: Drop unused error argument for list and implicit struct
Quoted 8 lines · Markus Armbruster
Quoted 2 lines · Eric Blake
No backend was setting an error when ending an implicit struct, or when iterating a list.
Perhaps "when ending the visit of a list or implicit struct, or when moving to the next list node" would be more precise. If you like it, I can do that on commit.
Yes, that sounds better.
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Re: [Qemu-devel] [PATCH v10 23/25] qapi: Drop unused error argument for list and implicit struct
In reply to Markus ArmbrusterQuoted 19 lines · Markus Armbruster
Quoted 2 lines · Eric Blake
No backend was setting an error when ending an implicit struct, or when iterating a list.
Perhaps "when ending the visit of a list or implicit struct, or when moving to the next list node" would be more precise. If you like it, I can do that on commit.
Quoted 10 lines
Make the callers a bit easier to follow
by making this a part of the contract, and removing the errp argument - callers can then unconditionally end an object as part of cleanup without having to think about whether a second error is dominated by a first, because there is no second error.A later patch will then tackle the larger task of splitting
visit_end_struct(), which can indeed set an error (and that cleanup will also have the side-effect of removing the use oferror_abortadded here).
Oh, while you're touching this up, the last half of this sentence is now stale (since the addition of &error_abort was split out into 22/25 instead); I'd just delete the entire parenthetical, ending with "indeed set an error."
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Re: [Qemu-devel] [PATCH v10 23/25] qapi: Drop unused error argument for list and implicit struct
Quoted 9 lines · Eric Blake
Quoted 8 lines · Markus Armbruster
Quoted 2 lines · Eric Blake
No backend was setting an error when ending an implicit struct, or when iterating a list.
Perhaps "when ending the visit of a list or implicit struct, or when moving to the next list node" would be more precise. If you like it, I can do that on commit.
Done.
Quoted 11 lines
Quoted 10 lines
Quoted 10 lines
Make the callers a bit easier to follow
by making this a part of the contract, and removing the errp argument - callers can then unconditionally end an object as part of cleanup without having to think about whether a second error is dominated by a first, because there is no second error.A later patch will then tackle the larger task of splitting
visit_end_struct(), which can indeed set an error (and that cleanup will also have the side-effect of removing the use oferror_abortadded here).
Quoted 4 lines
Oh, while you're touching this up, the last half of this sentence is now stale (since the addition of
&error_abortwas split out into 22/25 instead); I'd just delete the entire parenthetical, ending with "indeed set an error."
Done.
PATCH v10 24/25 qmp: Fix reference-counting of qnull on empty output visit
In reply to Eric BlakeCommit 6c2f9a15 ensured that we would not return NULL when the caller used an output visitor but had nothing to visit. But in doing so, it added a FIXME about a reference count leak that could abort qemu in the (unlikely) case of SIZE_MAX such visits (more plausible on 32-bit). (Although that commit suggested we might fix it in time for 2.5, we ran out of time; fortunately, it is unlikely enough to bite that it was not worth worrying about during the 2.5 release.)
This fixes things by documenting the internal contracts, and explaining why the internal function can return NULL and only the public facing interface needs to worry about qnull(), thus avoiding over-referencing the qnull_ global object.
It does not, however, fix the stupidity of the stack mixing up two separate pieces of information; add a FIXME to explain that issue, which will be fixed shortly in a future patch.
---
v10: tweak comments and add assert, drop R-b
v9: enhance commit message
v8: rebase to earlier changes
v7: cc qemu-stable, tweak some asserts, drop stale comment, add more comments
v6: no change
--- qapi/qmp-output-visitor.c | 41 ++++++++++++++++++++++++++++++++++------- tests/test-qmp-output-visitor.c | 2 ++ 2 files changed, 36 insertions(+), 7 deletions(-)
qapi/qmp-output-visitor.c +34 -7
@@ -30,6 +30,15 @@ typedef QTAILQ_HEAD(QStack, QStackEntry) QStack;struct QmpOutputVisitor {Visitor visitor; +/* FIXME: we are abusing stack to hold two separate pieces of +* information: the current root object in slot 0, and the stack +* of N objects still being built in slots 1 through N (for N+1 +* slots in use). Worse, our behavior is inconsistent: +* qmp_output_add_obj() visiting two top-level scalars in a row +* discards the first in favor of the second, but visiting two +* top-level objects in a row tries to append the second object +* into the first (since the first object was placed in the stack +* in both slot 0 and 1, but only popped from slot 1). */ QStack stack; };
@@ -42,10 +51,12 @@ static QmpOutputVisitor *to_qov(Visitor *v)return container_of (v, QmpOutputVisitor, visitor); } +/* Push @value onto the stack of current QObjects being built */ static void qmp_output_push_obj (QmpOutputVisitor *qov,QObject *value) {QStackEntry *e =g_malloc0 (sizeof (*e)); +assert (value); e->value = value;if (qobject_type (e->value) ==QTYPE_QLIST ) { e->is_list_head = true;
@@ -53,44 +64,53 @@ static void qmp_output_push_obj(QmpOutputVisitor *qov, QObject *value)QTAILQ_INSERT_HEAD (&qov->stack, e, node); } +/* Pop a value off the stack of QObjects being built, and return it. */ static QObject *qmp_output_pop (QmpOutputVisitor *qov) {QStackEntry *e =QTAILQ_FIRST (&qov->stack);QObject *value; + +assert (e);QTAILQ_REMOVE (&qov->stack, e, node); value = e->value; +assert (value);g_free (e);return value; } +/* Grab the root QObject, if any */ static QObject *qmp_output_first (QmpOutputVisitor *qov) {QStackEntry *e =QTAILQ_LAST (&qov->stack, QStack); -/* -* FIXME Wrong, because qmp_output_get_qobject() will increment -* the refcnt *again*. We need to think through how visitors -* handle null. -*/ if (!e) { -return qnull (); +/* No root */ +return NULL ; } - +assert (e->value);return e->value; } +/* Peek at the top of the stack of QObjects being built. +* The stack must not be empty. */ static QObject *qmp_output_last (QmpOutputVisitor *qov) {QStackEntry *e =QTAILQ_FIRST (&qov->stack); + +assert (e && e->value);return e->value; } +/* Add @value to the current QObject being built. +* If the stack is visiting a dictionary or list, @value is now owned +* by that container. Otherwise, @value is now the root. */ static void qmp_output_add_obj (QmpOutputVisitor *qov,const char *name,QObject *value) {QObject *cur;if (QTAILQ_EMPTY (&qov->stack)) { +/* Stack was empty, track this object as root */ qmp_output_push_obj (qov, value);return ; }
@@ -99,13 +119,17 @@ static void qmp_output_add_obj(QmpOutputVisitor *qov, const char *name,switch (qobject_type (cur)) {case QTYPE_QDICT : +assert (name);qdict_put_obj (qobject_to_qdict (cur), name, value);break ;case QTYPE_QLIST :qlist_append_obj (qobject_to_qlist (cur), value);break ;default : +/* The previous root was a scalar, replace it with a new root */ +/* FIXME this is abusing the stack; see comment above */ qobject_decref (qmp_output_pop (qov)); +assert (QTAILQ_EMPTY (&qov->stack));qmp_output_push_obj (qov, value);break ; }
@@ -205,11 +229,14 @@ static void qmp_output_type_any(Visitor *v, const char *name, QObject **obj,qmp_output_add_obj (qov, name, *obj); } +/* Finish building, and return the root object. Will not be NULL. */ QObject *qmp_output_get_qobject (QmpOutputVisitor *qov) {QObject *obj =qmp_output_first (qov);if (obj) {qobject_incref (obj); + }else { + obj =qnull (); }return obj; }
tests/test-qmp-output-visitor.c +2 -0
@@ -461,6 +461,8 @@ static void test_visitor_out_empty(TestOutputVisitorData *data, arg =qmp_output_get_qobject (data->qov);g_assert (qobject_type (arg) ==QTYPE_QNULL ); +/* Check that qnull reference counting is sane */ +g_assert (arg->refcnt ==2 );qobject_decref (arg); }
Signature · 1 line
2.5.0
PATCH v10 25/25 qmp: Don't abuse stack to track qmp-output root
In reply to Eric BlakeThe previous commit documented an inconsistency in how we are using the stack of qmp-output-visitor. Normally, pushing a single top-level object puts the object on the stack twice:
once as the root, and once as the current container being appended to; but popping that struct only pops once. However, qmp_ouput_add() was trying to either set up the added object as the new root (works if you parse two top-level scalars in a
row: the second replaces the first as the root) or as a member of the current container (works as long as you have an open container on the stack; but if you have popped the first top-level container, it then resolves to the root and still tries to add into that existing container).
Fix the stupidity by not tracking two separate things in the stack. Drop the now-useless qmp_output_first() and qmp_output_last() while at it.
Saved for a later patch: we still are rather sloppy in that qmp_output_get_object() can be called in the middle of a parse, rather than requiring that a visit is complete.
---
v10: rebase to earlier changes, inline qmp_output_last, drop R-b
v9: no change
v8: rebase to earlier changes
v7: retitle; rebase to earlier changes, drop qmp_output_first()
v6: no change
--- qapi/qmp-output-visitor.c | 89 ++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 63 deletions(-)
qapi/qmp-output-visitor.c +26 -63
@@ -30,16 +30,8 @@ typedef QTAILQ_HEAD(QStack, QStackEntry) QStack;struct QmpOutputVisitor {Visitor visitor; -/* FIXME: we are abusing stack to hold two separate pieces of -* information: the current root object in slot 0, and the stack -* of N objects still being built in slots 1 through N (for N+1 -* slots in use). Worse, our behavior is inconsistent: -* qmp_output_add_obj() visiting two top-level scalars in a row -* discards the first in favor of the second, but visiting two -* top-level objects in a row tries to append the second object -* into the first (since the first object was placed in the stack -* in both slot 0 and 1, but only popped from slot 1). */ -QStack stack; +QStack stack;/* Stack of containers that haven't yet been finished */ +QObject *root;/* Root of the output visit */ };#define qmp_output_add (qov, name, value) \
@@ -56,6 +48,7 @@ static void qmp_output_push_obj(QmpOutputVisitor *qov, QObject *value) {QStackEntry *e =g_malloc0 (sizeof (*e)); +assert (qov->root);assert (value); e->value = value;if (qobject_type (e->value) ==QTYPE_QLIST ) {
@@ -78,60 +71,32 @@ static QObject *qmp_output_pop(QmpOutputVisitor *qov)return value; } -/* Grab the root QObject, if any */ -static QObject *qmp_output_first (QmpOutputVisitor *qov) -{ -QStackEntry *e =QTAILQ_LAST (&qov->stack, QStack); - -if (!e) { -/* No root */ -return NULL ; - } -assert (e->value); -return e->value; -} - -/* Peek at the top of the stack of QObjects being built. -* The stack must not be empty. */ -static QObject *qmp_output_last (QmpOutputVisitor *qov) -{ -QStackEntry *e =QTAILQ_FIRST (&qov->stack); - -assert (e && e->value); -return e->value; -} -/* Add @value to the current QObject being built. * If the stack is visiting a dictionary or list, @value is now owned * by that container. Otherwise, @value is now the root. */ static void qmp_output_add_obj (QmpOutputVisitor *qov,const char *name,QObject *value) { -QObject *cur; +QStackEntry *e =QTAILQ_FIRST (&qov->stack); +QObject *cur = e ? e->value :NULL ; -if (QTAILQ_EMPTY (&qov->stack)) { -/* Stack was empty, track this object as root */ -qmp_output_push_obj (qov, value); -return ; - } - - cur =qmp_output_last (qov); - -switch (qobject_type (cur)) { -case QTYPE_QDICT : -assert (name); -qdict_put_obj (qobject_to_qdict (cur), name, value); -break ; -case QTYPE_QLIST : -qlist_append_obj (qobject_to_qlist (cur), value); -break ; -default : -/* The previous root was a scalar, replace it with a new root */ -/* FIXME this is abusing the stack; see comment above */ -qobject_decref (qmp_output_pop (qov)); -assert (QTAILQ_EMPTY (&qov->stack)); -qmp_output_push_obj (qov, value); -break ; +if (!cur) { +/* FIXME we should require the user to reset the visitor, rather +* than throwing away the previous root */ +qobject_decref (qov->root); + qov->root = value; + }else { +switch (qobject_type (cur)) { +case QTYPE_QDICT : +assert (name); +qdict_put_obj (qobject_to_qdict (cur), name, value); +break ; +case QTYPE_QLIST : +qlist_append_obj (qobject_to_qlist (cur), value); +break ; +default : +g_assert_not_reached (); + } } }
@@ -232,7 +197,9 @@ static void qmp_output_type_any(Visitor *v, const char *name, QObject **obj,/* Finish building, and return the root object. Will not be NULL. */ QObject *qmp_output_get_qobject (QmpOutputVisitor *qov) { -QObject *obj =qmp_output_first (qov); +/* FIXME: we should require that a visit occurred, and that it is +* complete (no starts without a matching end) */ +QObject *obj = qov->root;if (obj) {qobject_incref (obj); }else {
@@ -250,16 +217,12 @@ void qmp_output_visitor_cleanup(QmpOutputVisitor *v) {QStackEntry *e, *tmp; -/* The bottom QStackEntry, if any, owns the root QObject. See the -* qmp_output_push_obj() invocations in qmp_output_add_obj(). */ -QObject *root =QTAILQ_EMPTY (&v->stack) ?NULL :qmp_output_first (v); - QTAILQ_FOREACH_SAFE(e, &v->stack, node, tmp) {QTAILQ_REMOVE (&v->stack, e, node);g_free (e); } -qobject_decref (root); +qobject_decref (v->root);g_free (v); }
Signature · 1 line
2.5.0
Quoted 18 lines · Eric Blake
Based on qemu.git master. No pending prerequisites
Also available as a tag at this location:
git fetchgit://repo.or.cz/qemu/ericb.gitqapi-cleanupv10eand will soon be part of my branch with the rest of the v5 series, at:
http://repo.or.cz/qemu/ericb.git/shortlog/refs/heads/qapiv10 notes:
This is patches 1-20 of v9; 21-37 of that series will come later, but this half was relatively clean and should be ready to merge. Plus, this half includes the argument reordering, which touches a lot of the tree, so getting it in sooner rather than later will minimize rebase churn. A couple patches were split differently or retitled. Reviewed-by was kept on patches that didn't change in content (even if the content was split across different patch boundaries).
Quoted 2 lines
Most of the work here was addressing Markus' review comments, or rebasing later patches on top of earlier changes.
I found one harmless rebase mistake, and got a few suggestions on commit messages, nothing that can't be touched up on commit.
With the harmless rebase mistake cleaned up, series
[...]
Markus Armbruster
AppliedQuoted 23 lines · Markus Armbruster
Quoted 18 lines · Eric Blake
Based on qemu.git master. No pending prerequisites
Also available as a tag at this location:
git fetchgit://repo.or.cz/qemu/ericb.gitqapi-cleanupv10eand will soon be part of my branch with the rest of the v5 series, at:
http://repo.or.cz/qemu/ericb.git/shortlog/refs/heads/qapiv10 notes:
This is patches 1-20 of v9; 21-37 of that series will come later, but this half was relatively clean and should be ready to merge. Plus, this half includes the argument reordering, which touches a lot of the tree, so getting it in sooner rather than later will minimize rebase churn. A couple patches were split differently or retitled. Reviewed-by was kept on patches that didn't change in content (even if the content was split across different patch boundaries).Quoted 2 lines
Most of the work here was addressing Markus' review comments, or rebasing later patches on top of earlier changes.
Quoted 7 lines
I found one harmless rebase mistake, and got a few suggestions on commit messages, nothing that can't be touched up on commit.
With the harmless rebase mistake cleaned up, series
Reviewed-by Markus Armbruster <[email protected]>[...]
Applied to qapi-next with these nits addressed.
Marc-André, Eric dropped a few of your R-bys. I'll wait a few days in case you'd like to put them back.