| Message ID | 1447836791-369-30-git-send-email-eblake@redhat.com |
|---|---|
| State | New |
| Headers | show |
Eric Blake <eblake@redhat.com> writes: > The name QType is more in line with our conventions for qapi > types, and matches the fact that each enum member has a prefix > of QTYPE_. > > Signed-off-by: Eric Blake <eblake@redhat.com> At this point, the connection to QAPI is unobvious. You can either point to CODING_STYLE, which ask for type names in CamelCase, or to the next patch. Patch looks good.
On 11/18/2015 11:25 AM, Markus Armbruster wrote: > Eric Blake <eblake@redhat.com> writes: > >> The name QType is more in line with our conventions for qapi >> types, and matches the fact that each enum member has a prefix >> of QTYPE_. >> >> Signed-off-by: Eric Blake <eblake@redhat.com> > > At this point, the connection to QAPI is unobvious. > > You can either point to CODING_STYLE, which ask for type names in > CamelCase, or to the next patch. How about: The name QType matches our CODING_STYLE conventions for type names in CamelCase. It also matches the fact that we are already naming all the enum members with a prefix of QTYPE, not QTYPE_CODE. And doing the rename will also make it easier for the next patch to use QAPI for the enum, which also wants CamelCase type names. Feel free to touch up the commit message as you see fit.
Eric Blake <eblake@redhat.com> writes: > On 11/18/2015 11:25 AM, Markus Armbruster wrote: >> Eric Blake <eblake@redhat.com> writes: >> >>> The name QType is more in line with our conventions for qapi >>> types, and matches the fact that each enum member has a prefix >>> of QTYPE_. >>> >>> Signed-off-by: Eric Blake <eblake@redhat.com> >> >> At this point, the connection to QAPI is unobvious. >> >> You can either point to CODING_STYLE, which ask for type names in >> CamelCase, or to the next patch. > > How about: > > The name QType matches our CODING_STYLE conventions for type names in > CamelCase. It also matches the fact that we are already naming all the > enum members with a prefix of QTYPE, not QTYPE_CODE. And doing the > rename will also make it easier for the next patch to use QAPI for the > enum, which also wants CamelCase type names. > > Feel free to touch up the commit message as you see fit. Sold!
diff --git a/block/qapi.c b/block/qapi.c index d20262d..4eb48fc 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -590,7 +590,7 @@ static void dump_qlist(fprintf_function func_fprintf, void *f, int indentation, int i = 0; for (entry = qlist_first(list); entry; entry = qlist_next(entry), i++) { - qtype_code type = qobject_type(entry->value); + QType type = qobject_type(entry->value); bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST); const char *format = composite ? "%*s[%i]:\n" : "%*s[%i]: "; @@ -608,7 +608,7 @@ static void dump_qdict(fprintf_function func_fprintf, void *f, int indentation, const QDictEntry *entry; for (entry = qdict_first(dict); entry; entry = qdict_next(dict, entry)) { - qtype_code type = qobject_type(entry->value); + QType type = qobject_type(entry->value); bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST); const char *format = composite ? "%*s%s:\n" : "%*s%s: "; char key[strlen(entry->key) + 1]; diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index e6dbde4..c66429a 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -239,7 +239,7 @@ struct Property { PropertyInfo *info; int offset; uint8_t bitnr; - qtype_code qtype; + QType qtype; int64_t defval; int arrayoffset; PropertyInfo *arrayinfo; diff --git a/include/qapi/qmp/qobject.h b/include/qapi/qmp/qobject.h index 83ed70b..0558ff3 100644 --- a/include/qapi/qmp/qobject.h +++ b/include/qapi/qmp/qobject.h @@ -45,12 +45,12 @@ typedef enum { QTYPE_QFLOAT, QTYPE_QBOOL, QTYPE_MAX, -} qtype_code; +} QType; typedef struct QObject QObject; struct QObject { - qtype_code type; + QType type; size_t refcnt; void (*destroy)(QObject *); }; @@ -71,7 +71,7 @@ struct QObject { qobject_decref(obj ? QOBJECT(obj) : NULL) /* Initialize an object to default values */ -static inline void qobject_init(QObject *obj, qtype_code type, +static inline void qobject_init(QObject *obj, QType type, void (*destroy)(struct QObject *)) { assert(type); @@ -105,7 +105,7 @@ static inline void qobject_decref(QObject *obj) /** * qobject_type(): Return the QObject's type */ -static inline qtype_code qobject_type(const QObject *obj) +static inline QType qobject_type(const QObject *obj) { assert(obj->type); return obj->type; diff --git a/qobject/qdict.c b/qobject/qdict.c index cf62269..d5e6df1 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -179,8 +179,7 @@ size_t qdict_size(const QDict *qdict) /** * qdict_get_obj(): Get a QObject of a specific type */ -static QObject *qdict_get_obj(const QDict *qdict, const char *key, - qtype_code type) +static QObject *qdict_get_obj(const QDict *qdict, const char *key, QType type) { QObject *obj; diff --git a/scripts/qapi.py b/scripts/qapi.py index e41dbaf..7c0ef76 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -34,7 +34,7 @@ builtin_types = { 'uint32': 'QTYPE_QINT', 'uint64': 'QTYPE_QINT', 'size': 'QTYPE_QINT', - 'any': None, # any qtype_code possible, actually + 'any': None, # any QType possible, actually } # Whitelist of commands allowed to return a non-dictionary
The name QType is more in line with our conventions for qapi types, and matches the fact that each enum member has a prefix of QTYPE_. Signed-off-by: Eric Blake <eblake@redhat.com> --- v12: new patch split off of 21/28 --- block/qapi.c | 4 ++-- include/hw/qdev-core.h | 2 +- include/qapi/qmp/qobject.h | 8 ++++---- qobject/qdict.c | 3 +-- scripts/qapi.py | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-)