[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/26] qapi-event: Clean up how name of enum QAPI
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 04/26] qapi-event: Clean up how name of enum QAPIEvent is made |
Date: |
Fri, 28 Aug 2015 18:45:44 +0200 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
docs/qapi-code-gen.txt | 8 ++++----
scripts/qapi-event.py | 2 +-
tests/test-qmp-event.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt
index e7e7281..c2ac21c 100644
--- a/docs/qapi-code-gen.txt
+++ b/docs/qapi-code-gen.txt
@@ -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
diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py
index 56bc602..cc74f4d 100644
--- a/scripts/qapi-event.py
+++ b/scripts/qapi-event.py
@@ -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 = []
diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c
index 1ee40e1..28f146d 100644
--- a/tests/test-qmp-event.c
+++ b/tests/test-qmp-event.c
@@ -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;
--
2.4.3
- [Qemu-devel] [PATCH v2 00/26] qapi: Another round of fixes and cleanups, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 05/26] qapi: Reject -p arguments that break qapi-event.py, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 12/26] tests/qapi-schema: Document alternate's enum lacks visit function, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 04/26] qapi-event: Clean up how name of enum QAPIEvent is made,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 10/26] qapi-visit: Replace list implicit_structs by set, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 01/26] qapi: Clarify docs on including the same file multiple times, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 03/26] qapi: Simplify guardname(), Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 02/26] qapi: Clean up cgen() and mcgen(), Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 11/26] qapi-visit: Fix two name arguments passed to visitors, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 08/26] qapi: Generate a nicer struct for flat unions, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 13/26] tests/qapi-schema: Document events with base don't work, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 07/26] qapi: Fix generated code when flat union has member 'kind', Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 16/26] qapi: Document flaws in checking of names, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 09/26] qapi-visit: Fix generated code when schema has forward refs, Markus Armbruster, 2015/08/28