yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-10-19 21:38:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

qobject: Rename qtype_code to QType

Browse Source 
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.

Backports commit 1310a3d3bd9301ff5a825287638cfab24c2c6689 from qemu
This commit is contained in:
Eric Blake 2018-02-19 21:41:48 -05:00 committed by Lioncash
parent cc1d62568e
commit 805c803298
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qemu/include/qapi/qmp/qobject.h
View File

@ -46,10 +46,10 @@ typedef enum {
QTYPE_QBOOL,
QTYPE_QERROR,
QTYPE_MAX,
} qtype_code;
} QType;
typedef struct QObject {
qtype_code type;
QType type;
size_t refcnt;
} QObject;
@ -69,7 +69,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;
@ -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(QTYPE_NONE < obj->type && obj->type < QTYPE_MAX);
return obj->type;

3
qemu/qobject/qdict.c
View File

@ -178,8 +178,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;

2
qemu/scripts/qapi.py
View File

@ -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