Commit 1310a3d3 authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

qobject: Rename qtype_code to QType 



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 providing the enum, which also wants CamelCase type names.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <1449033659-25497-3-git-send-email-eblake@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 55e1819c

block/qapi.c

+2 −2
Original line number Diff line number Diff line
@@ -588,7 +588,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]: ";
@@ -606,7 +606,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];

include/hw/qdev-core.h

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ struct Property { 
    PropertyInfo *info;

    ptrdiff_t    offset;

    uint8_t      bitnr;

    qtype_code   qtype;

    QType        qtype;

    int64_t      defval;

    int          arrayoffset;

    PropertyInfo *arrayinfo;

include/qapi/qmp/qobject.h

+4 −4
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ typedef enum { 
    QTYPE_QFLOAT,

    QTYPE_QBOOL,

    QTYPE_MAX,

} qtype_code;

} QType;



typedef struct QObject {

    qtype_code type;

    QType type;

    size_t refcnt;

} QObject;
@@ -64,7 +64,7 @@ typedef 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)

{

    assert(QTYPE_NONE < type && type < QTYPE_MAX);

    obj->refcnt = 1;
@@ -100,7 +100,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(QTYPE_NONE < obj->type && obj->type < QTYPE_MAX);

    return obj->type;

qobject/qdict.c

+1 −2
Original line number Diff line number Diff line
@@ -177,8 +177,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;

scripts/qapi.py

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,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