OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases 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.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1449033659-25497-3-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2015-12-01 22:20:46 -07:00 committed by Markus Armbruster
parent 55e1819c50
commit 1310a3d3bd
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/qapi.c
View File

@ -588,7 +588,7 @@ static void dump_qlist(fprintf_function func_fprintf, void *f, int indentation,
int i = 0; int i = 0;
for (entry = qlist_first(list); entry; entry = qlist_next(entry), i++) { 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); bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST);
const char *format = composite ? "%*s[%i]:\n" : "%*s[%i]: "; 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; const QDictEntry *entry;
for (entry = qdict_first(dict); entry; entry = qdict_next(dict, 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); bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST);
const char *format = composite ? "%*s%s:\n" : "%*s%s: "; const char *format = composite ? "%*s%s:\n" : "%*s%s: ";
char key[strlen(entry->key) + 1]; char key[strlen(entry->key) + 1];

2
include/hw/qdev-core.h
View File

@ -239,7 +239,7 @@ struct Property {
PropertyInfo *info; PropertyInfo *info;
ptrdiff_t offset; ptrdiff_t offset;
uint8_t bitnr; uint8_t bitnr;
qtype_code qtype; QType qtype;
int64_t defval; int64_t defval;
int arrayoffset; int arrayoffset;
PropertyInfo *arrayinfo; PropertyInfo *arrayinfo;

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

@ -45,10 +45,10 @@ typedef enum {
QTYPE_QFLOAT, QTYPE_QFLOAT,
QTYPE_QBOOL, QTYPE_QBOOL,
QTYPE_MAX, QTYPE_MAX,
} qtype_code; } QType;
typedef struct QObject { typedef struct QObject {
qtype_code type; QType type;
size_t refcnt; size_t refcnt;
} QObject; } QObject;
@ -64,7 +64,7 @@ typedef struct QObject {
qobject_decref(obj ? QOBJECT(obj) : NULL) qobject_decref(obj ? QOBJECT(obj) : NULL)
/* Initialize an object to default values */ /* 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); assert(QTYPE_NONE < type && type < QTYPE_MAX);
obj->refcnt = 1; obj->refcnt = 1;
@ -100,7 +100,7 @@ static inline void qobject_decref(QObject *obj)
/** /**
* qobject_type(): Return the QObject's type * 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); assert(QTYPE_NONE < obj->type && obj->type < QTYPE_MAX);
return obj->type; return obj->type;

3
qobject/qdict.c
View File

@ -177,8 +177,7 @@ size_t qdict_size(const QDict *qdict)
/** /**
* qdict_get_obj(): Get a QObject of a specific type * qdict_get_obj(): Get a QObject of a specific type
*/ */
static QObject *qdict_get_obj(const QDict *qdict, const char *key, static QObject *qdict_get_obj(const QDict *qdict, const char *key, QType type)
qtype_code type)
{ {
QObject *obj; QObject *obj;

2
scripts/qapi.py
View File

@ -33,7 +33,7 @@ builtin_types = {
'uint32': 'QTYPE_QINT', 'uint32': 'QTYPE_QINT',
'uint64': 'QTYPE_QINT', 'uint64': 'QTYPE_QINT',
'size': '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 # Whitelist of commands allowed to return a non-dictionary