haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qapi-event: Clean up how name of enum QAPIEvent is made

Browse source 
Use c_name() instead of ad hoc code.  Doesn't upcase the -p prefix,
which is an improvement in my book.  Unbreaks prefix containing '.',
but other funny characters remain broken.  To be fixed next.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2015-07-01 12:59:40 +02:00
parent 00dfc3b2c2
commit 016a335bd8
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/qapi-code-gen.txt
View file

@ -826,7 +826,7 @@ Example:
QDECREF(qmp);
}
const char *EXAMPLE_QAPIEvent_lookup[] = {
const char *example_QAPIEvent_lookup[] = {
"MY_EVENT",
NULL,
};
@ -843,11 +843,11 @@ Example:
void qapi_event_send_my_event(Error **errp);
extern const char *EXAMPLE_QAPIEvent_lookup[];
typedef enum EXAMPLE_QAPIEvent
extern const char *example_QAPIEvent_lookup[];
typedef enum example_QAPIEvent
{
EXAMPLE_QAPI_EVENT_MY_EVENT = 0,
EXAMPLE_QAPI_EVENT_MAX = 1,
} EXAMPLE_QAPIEvent;
} example_QAPIEvent;
#endif

2
scripts/qapi-event.py
View file

@ -267,7 +267,7 @@ fdecl.write(mcgen('''
exprs = parse_schema(input_file)
event_enum_name = prefix.upper().replace('-', '_') + "QAPIEvent"
event_enum_name = c_name(prefix + "QAPIEvent", protect=False)
event_enum_values = []
event_enum_strings = []

2
tests/test-qmp-event.c
View file

@ -94,7 +94,7 @@ static bool qdict_cmp_simple(QDict *a, QDict *b)
/* This function is hooked as final emit function, which can verify the
correctness. */
static void event_test_emit(TEST_QAPIEvent event, QDict *d, Error **errp)
static void event_test_emit(test_QAPIEvent event, QDict *d, Error **errp)
{
QObject *obj;
QDict *t;