2015-08-21 07:04:50 +00:00
|
|
|
#
|
|
|
|
|
# QAPI event generator
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2014 Wenchao Xia
|
qapi: Improve generated event use of qapi visitor
All other successful clients of visit_start_struct() were paired
with an unconditional visit_end_struct(); but the generated
code for events was relying on qmp_output_visitor_cleanup() to
work on an incomplete visit. Alter the code to guarantee that
the struct is completed, which will make a future patch to
split visit_end_struct() easier to reason about. While at it,
drop some assertions and comments that are not present in other
uses of the qmp output visitor, and pass NULL rather than "" as
the 'kind' parameter (matching most other uses where obj is NULL).
The changes to the generated code look like:
| qmp = qmp_event_build_dict("DEVICE_TRAY_MOVED");
|
| qov = qmp_output_visitor_new();
|- g_assert(qov);
|-
| v = qmp_output_get_visitor(qov);
|- g_assert(v);
|
|- /* Fake visit, as if all members are under a structure */
|- visit_start_struct(v, NULL, "", "DEVICE_TRAY_MOVED", 0, &err);
|+ visit_start_struct(v, NULL, NULL, "DEVICE_TRAY_MOVED", 0, &err);
| if (err) {
| goto out;
| }
| visit_type_str(v, (char **)&device, "device", &err);
| if (err) {
|- goto out;
|+ goto out_obj;
| }
| visit_type_bool(v, &tray_open, "tray-open", &err);
| if (err) {
|- goto out;
|+ goto out_obj;
| }
|- visit_end_struct(v, &err);
|+out_obj:
|+ visit_end_struct(v, err ? NULL : &err);
| if (err) {
| goto out;
| }
|
| obj = qmp_output_get_qobject(qov);
|- g_assert(obj != NULL);
|+ g_assert(obj);
|
| qdict_put_obj(qmp, "data", obj);
| emit(QAPI_EVENT_DEVICE_TRAY_MOVED, qmp, &err);
Note that the 'goto out_obj' with no intervening code before the
label, as well as the construct of 'err ? NULL : &err', are both
a bit unusual but also temporary; they get fixed in a later patch
that splits visit_end_struct() to drop its errp parameter by moving
some checking before the label. But until that time, this was the
simplest way to avoid the appearance of passing a possibly-set
error to visit_end_struct(), even though actual code inspection
shows that visit_end_struct() for a QMP output visitor will never
set an error.
Backports commit a16e3e5c5825c90887a863513916f93eeec16c55 from qemu
2018-02-20 03:17:42 +00:00
|
|
|
# Copyright (c) 2015-2016 Red Hat Inc.
|
2015-08-21 07:04:50 +00:00
|
|
|
#
|
|
|
|
|
# Authors:
|
|
|
|
|
# Wenchao Xia <wenchaoqemu@gmail.com>
|
qapi-event: Convert to QAPISchemaVisitor, fixing data with base
Fixes events whose data is struct with base to include the struct's
base members. Test case is qapi-schema-test.json's event
__org.qemu_x-command:
{ 'event': '__ORG.QEMU_X-EVENT', 'data': '__org.qemu_x-Struct' }
{ 'struct': '__org.qemu_x-Struct', 'base': '__org.qemu_x-Base',
'data': { '__org.qemu_x-member2': 'str' } }
{ 'struct': '__org.qemu_x-Base',
'data': { '__org.qemu_x-member1': '__org.qemu_x-Enum' } }
Patch's effect on generated qapi_event_send___org_qemu_x_event():
-void qapi_event_send___org_qemu_x_event(const char *__org_qemu_x_member2,
+void qapi_event_send___org_qemu_x_event(__org_qemu_x_Enum __org_qemu_x_member1,
+ const char *__org_qemu_x_member2,
Error **errp)
{
QDict *qmp;
@@ -224,6 +225,10 @@ void qapi_event_send___org_qemu_x_event(
goto clean;
}
+ visit_type___org_qemu_x_Enum(v, &__org_qemu_x_member1, "__org.qemu_x-member1", &local_err);
+ if (local_err) {
+ goto clean;
+ }
visit_type_str(v, (char **)&__org_qemu_x_member2, "__org.qemu_x-member2", &local_err);
if (local_err) {
goto clean;
Code is generated in a different order now, but that doesn't matter.
Backports commit 05f43a960877cf941635324b2d0a74c0d0f7128e from qemu
2018-02-19 22:16:27 +00:00
|
|
|
# Markus Armbruster <armbru@redhat.com>
|
2015-08-21 07:04:50 +00:00
|
|
|
#
|
|
|
|
|
# This work is licensed under the terms of the GNU GPL, version 2.
|
|
|
|
|
# See the COPYING file in the top-level directory.
|
|
|
|
|
|
|
|
|
|
from qapi import *
|
|
|
|
|
|
2018-02-19 23:27:47 +00:00
|
|
|
def gen_event_send_proto(name, arg_type):
|
|
|
|
|
return 'void qapi_event_send_%(c_name)s(%(param)s)' % {
|
|
|
|
|
'c_name': c_name(name.lower()),
|
|
|
|
|
'param': gen_params(arg_type, 'Error **errp')}
|
2015-08-21 07:04:50 +00:00
|
|
|
|
|
|
|
|
|
2018-02-19 23:27:47 +00:00
|
|
|
def gen_event_send_decl(name, arg_type):
|
2015-08-21 07:04:50 +00:00
|
|
|
return mcgen('''
|
|
|
|
|
|
2018-02-19 23:27:47 +00:00
|
|
|
%(proto)s;
|
2015-08-21 07:04:50 +00:00
|
|
|
''',
|
2018-02-19 23:27:47 +00:00
|
|
|
proto=gen_event_send_proto(name, arg_type))
|
|
|
|
|
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-19 23:27:47 +00:00
|
|
|
def gen_event_send(name, arg_type):
|
|
|
|
|
ret = mcgen('''
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-19 23:27:47 +00:00
|
|
|
%(proto)s
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
|
QDict *qmp;
|
2018-02-19 23:12:13 +00:00
|
|
|
Error *err = NULL;
|
2015-08-21 07:04:50 +00:00
|
|
|
QMPEventFuncEmit emit;
|
2018-02-19 23:27:47 +00:00
|
|
|
''',
|
|
|
|
|
proto=gen_event_send_proto(name, arg_type))
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-19 23:27:47 +00:00
|
|
|
if arg_type and arg_type.members:
|
|
|
|
|
ret += mcgen('''
|
2015-08-21 07:04:50 +00:00
|
|
|
QmpOutputVisitor *qov;
|
|
|
|
|
Visitor *v;
|
|
|
|
|
QObject *obj;
|
|
|
|
|
|
2018-02-19 23:27:47 +00:00
|
|
|
''')
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-19 23:27:47 +00:00
|
|
|
ret += mcgen('''
|
2015-08-21 07:04:50 +00:00
|
|
|
emit = qmp_event_get_func_emit();
|
|
|
|
|
if (!emit) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2018-02-19 23:27:47 +00:00
|
|
|
qmp = qmp_event_build_dict("%(name)s");
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-19 23:27:47 +00:00
|
|
|
''',
|
|
|
|
|
name=name)
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-19 23:27:47 +00:00
|
|
|
if arg_type and arg_type.members:
|
|
|
|
|
ret += mcgen('''
|
2015-08-21 07:04:50 +00:00
|
|
|
qov = qmp_output_visitor_new();
|
|
|
|
|
|
|
|
|
|
v = qmp_output_get_visitor(qov);
|
|
|
|
|
|
2018-02-20 04:42:59 +00:00
|
|
|
visit_start_struct(v, "%(name)s", NULL, 0, &err);
|
2018-02-19 23:27:47 +00:00
|
|
|
''',
|
|
|
|
|
name=name)
|
|
|
|
|
ret += gen_err_check()
|
qapi: Improve generated event use of qapi visitor
All other successful clients of visit_start_struct() were paired
with an unconditional visit_end_struct(); but the generated
code for events was relying on qmp_output_visitor_cleanup() to
work on an incomplete visit. Alter the code to guarantee that
the struct is completed, which will make a future patch to
split visit_end_struct() easier to reason about. While at it,
drop some assertions and comments that are not present in other
uses of the qmp output visitor, and pass NULL rather than "" as
the 'kind' parameter (matching most other uses where obj is NULL).
The changes to the generated code look like:
| qmp = qmp_event_build_dict("DEVICE_TRAY_MOVED");
|
| qov = qmp_output_visitor_new();
|- g_assert(qov);
|-
| v = qmp_output_get_visitor(qov);
|- g_assert(v);
|
|- /* Fake visit, as if all members are under a structure */
|- visit_start_struct(v, NULL, "", "DEVICE_TRAY_MOVED", 0, &err);
|+ visit_start_struct(v, NULL, NULL, "DEVICE_TRAY_MOVED", 0, &err);
| if (err) {
| goto out;
| }
| visit_type_str(v, (char **)&device, "device", &err);
| if (err) {
|- goto out;
|+ goto out_obj;
| }
| visit_type_bool(v, &tray_open, "tray-open", &err);
| if (err) {
|- goto out;
|+ goto out_obj;
| }
|- visit_end_struct(v, &err);
|+out_obj:
|+ visit_end_struct(v, err ? NULL : &err);
| if (err) {
| goto out;
| }
|
| obj = qmp_output_get_qobject(qov);
|- g_assert(obj != NULL);
|+ g_assert(obj);
|
| qdict_put_obj(qmp, "data", obj);
| emit(QAPI_EVENT_DEVICE_TRAY_MOVED, qmp, &err);
Note that the 'goto out_obj' with no intervening code before the
label, as well as the construct of 'err ? NULL : &err', are both
a bit unusual but also temporary; they get fixed in a later patch
that splits visit_end_struct() to drop its errp parameter by moving
some checking before the label. But until that time, this was the
simplest way to avoid the appearance of passing a possibly-set
error to visit_end_struct(), even though actual code inspection
shows that visit_end_struct() for a QMP output visitor will never
set an error.
Backports commit a16e3e5c5825c90887a863513916f93eeec16c55 from qemu
2018-02-20 03:17:42 +00:00
|
|
|
ret += gen_visit_fields(arg_type.members, need_cast=True,
|
|
|
|
|
label='out_obj')
|
2018-02-19 23:27:47 +00:00
|
|
|
ret += mcgen('''
|
qapi: Improve generated event use of qapi visitor
All other successful clients of visit_start_struct() were paired
with an unconditional visit_end_struct(); but the generated
code for events was relying on qmp_output_visitor_cleanup() to
work on an incomplete visit. Alter the code to guarantee that
the struct is completed, which will make a future patch to
split visit_end_struct() easier to reason about. While at it,
drop some assertions and comments that are not present in other
uses of the qmp output visitor, and pass NULL rather than "" as
the 'kind' parameter (matching most other uses where obj is NULL).
The changes to the generated code look like:
| qmp = qmp_event_build_dict("DEVICE_TRAY_MOVED");
|
| qov = qmp_output_visitor_new();
|- g_assert(qov);
|-
| v = qmp_output_get_visitor(qov);
|- g_assert(v);
|
|- /* Fake visit, as if all members are under a structure */
|- visit_start_struct(v, NULL, "", "DEVICE_TRAY_MOVED", 0, &err);
|+ visit_start_struct(v, NULL, NULL, "DEVICE_TRAY_MOVED", 0, &err);
| if (err) {
| goto out;
| }
| visit_type_str(v, (char **)&device, "device", &err);
| if (err) {
|- goto out;
|+ goto out_obj;
| }
| visit_type_bool(v, &tray_open, "tray-open", &err);
| if (err) {
|- goto out;
|+ goto out_obj;
| }
|- visit_end_struct(v, &err);
|+out_obj:
|+ visit_end_struct(v, err ? NULL : &err);
| if (err) {
| goto out;
| }
|
| obj = qmp_output_get_qobject(qov);
|- g_assert(obj != NULL);
|+ g_assert(obj);
|
| qdict_put_obj(qmp, "data", obj);
| emit(QAPI_EVENT_DEVICE_TRAY_MOVED, qmp, &err);
Note that the 'goto out_obj' with no intervening code before the
label, as well as the construct of 'err ? NULL : &err', are both
a bit unusual but also temporary; they get fixed in a later patch
that splits visit_end_struct() to drop its errp parameter by moving
some checking before the label. But until that time, this was the
simplest way to avoid the appearance of passing a possibly-set
error to visit_end_struct(), even though actual code inspection
shows that visit_end_struct() for a QMP output visitor will never
set an error.
Backports commit a16e3e5c5825c90887a863513916f93eeec16c55 from qemu
2018-02-20 03:17:42 +00:00
|
|
|
out_obj:
|
|
|
|
|
visit_end_struct(v, err ? NULL : &err);
|
2018-02-19 23:12:13 +00:00
|
|
|
if (err) {
|
2018-02-19 23:23:12 +00:00
|
|
|
goto out;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
obj = qmp_output_get_qobject(qov);
|
qapi: Improve generated event use of qapi visitor
All other successful clients of visit_start_struct() were paired
with an unconditional visit_end_struct(); but the generated
code for events was relying on qmp_output_visitor_cleanup() to
work on an incomplete visit. Alter the code to guarantee that
the struct is completed, which will make a future patch to
split visit_end_struct() easier to reason about. While at it,
drop some assertions and comments that are not present in other
uses of the qmp output visitor, and pass NULL rather than "" as
the 'kind' parameter (matching most other uses where obj is NULL).
The changes to the generated code look like:
| qmp = qmp_event_build_dict("DEVICE_TRAY_MOVED");
|
| qov = qmp_output_visitor_new();
|- g_assert(qov);
|-
| v = qmp_output_get_visitor(qov);
|- g_assert(v);
|
|- /* Fake visit, as if all members are under a structure */
|- visit_start_struct(v, NULL, "", "DEVICE_TRAY_MOVED", 0, &err);
|+ visit_start_struct(v, NULL, NULL, "DEVICE_TRAY_MOVED", 0, &err);
| if (err) {
| goto out;
| }
| visit_type_str(v, (char **)&device, "device", &err);
| if (err) {
|- goto out;
|+ goto out_obj;
| }
| visit_type_bool(v, &tray_open, "tray-open", &err);
| if (err) {
|- goto out;
|+ goto out_obj;
| }
|- visit_end_struct(v, &err);
|+out_obj:
|+ visit_end_struct(v, err ? NULL : &err);
| if (err) {
| goto out;
| }
|
| obj = qmp_output_get_qobject(qov);
|- g_assert(obj != NULL);
|+ g_assert(obj);
|
| qdict_put_obj(qmp, "data", obj);
| emit(QAPI_EVENT_DEVICE_TRAY_MOVED, qmp, &err);
Note that the 'goto out_obj' with no intervening code before the
label, as well as the construct of 'err ? NULL : &err', are both
a bit unusual but also temporary; they get fixed in a later patch
that splits visit_end_struct() to drop its errp parameter by moving
some checking before the label. But until that time, this was the
simplest way to avoid the appearance of passing a possibly-set
error to visit_end_struct(), even though actual code inspection
shows that visit_end_struct() for a QMP output visitor will never
set an error.
Backports commit a16e3e5c5825c90887a863513916f93eeec16c55 from qemu
2018-02-20 03:17:42 +00:00
|
|
|
g_assert(obj);
|
2015-08-21 07:04:50 +00:00
|
|
|
|
|
|
|
|
qdict_put_obj(qmp, "data", obj);
|
2018-02-19 23:27:47 +00:00
|
|
|
''')
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-19 23:27:47 +00:00
|
|
|
ret += mcgen('''
|
|
|
|
|
emit(%(c_enum)s, qmp, &err);
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-19 23:27:47 +00:00
|
|
|
''',
|
|
|
|
|
c_enum=c_enum_const(event_enum_name, name))
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-19 23:27:47 +00:00
|
|
|
if arg_type and arg_type.members:
|
|
|
|
|
ret += mcgen('''
|
|
|
|
|
out:
|
2015-08-21 07:04:50 +00:00
|
|
|
qmp_output_visitor_cleanup(qov);
|
2018-02-19 23:27:47 +00:00
|
|
|
''')
|
|
|
|
|
ret += mcgen('''
|
2018-02-19 23:12:13 +00:00
|
|
|
error_propagate(errp, err);
|
2015-08-21 07:04:50 +00:00
|
|
|
QDECREF(qmp);
|
|
|
|
|
}
|
2018-02-19 23:27:47 +00:00
|
|
|
''')
|
2015-08-21 07:04:50 +00:00
|
|
|
return ret
|
|
|
|
|
|
qapi-event: Convert to QAPISchemaVisitor, fixing data with base
Fixes events whose data is struct with base to include the struct's
base members. Test case is qapi-schema-test.json's event
__org.qemu_x-command:
{ 'event': '__ORG.QEMU_X-EVENT', 'data': '__org.qemu_x-Struct' }
{ 'struct': '__org.qemu_x-Struct', 'base': '__org.qemu_x-Base',
'data': { '__org.qemu_x-member2': 'str' } }
{ 'struct': '__org.qemu_x-Base',
'data': { '__org.qemu_x-member1': '__org.qemu_x-Enum' } }
Patch's effect on generated qapi_event_send___org_qemu_x_event():
-void qapi_event_send___org_qemu_x_event(const char *__org_qemu_x_member2,
+void qapi_event_send___org_qemu_x_event(__org_qemu_x_Enum __org_qemu_x_member1,
+ const char *__org_qemu_x_member2,
Error **errp)
{
QDict *qmp;
@@ -224,6 +225,10 @@ void qapi_event_send___org_qemu_x_event(
goto clean;
}
+ visit_type___org_qemu_x_Enum(v, &__org_qemu_x_member1, "__org.qemu_x-member1", &local_err);
+ if (local_err) {
+ goto clean;
+ }
visit_type_str(v, (char **)&__org_qemu_x_member2, "__org.qemu_x-member2", &local_err);
if (local_err) {
goto clean;
Code is generated in a different order now, but that doesn't matter.
Backports commit 05f43a960877cf941635324b2d0a74c0d0f7128e from qemu
2018-02-19 22:16:27 +00:00
|
|
|
|
|
|
|
|
class QAPISchemaGenEventVisitor(QAPISchemaVisitor):
|
|
|
|
|
def __init__(self):
|
|
|
|
|
self.decl = None
|
|
|
|
|
self.defn = None
|
|
|
|
|
self._event_names = None
|
|
|
|
|
|
|
|
|
|
def visit_begin(self, schema):
|
|
|
|
|
self.decl = ''
|
|
|
|
|
self.defn = ''
|
|
|
|
|
self._event_names = []
|
|
|
|
|
|
|
|
|
|
def visit_end(self):
|
2018-02-19 23:27:47 +00:00
|
|
|
self.decl += gen_enum(event_enum_name, self._event_names)
|
|
|
|
|
self.defn += gen_enum_lookup(event_enum_name, self._event_names)
|
|
|
|
|
self._event_names = None;
|
qapi-event: Convert to QAPISchemaVisitor, fixing data with base
Fixes events whose data is struct with base to include the struct's
base members. Test case is qapi-schema-test.json's event
__org.qemu_x-command:
{ 'event': '__ORG.QEMU_X-EVENT', 'data': '__org.qemu_x-Struct' }
{ 'struct': '__org.qemu_x-Struct', 'base': '__org.qemu_x-Base',
'data': { '__org.qemu_x-member2': 'str' } }
{ 'struct': '__org.qemu_x-Base',
'data': { '__org.qemu_x-member1': '__org.qemu_x-Enum' } }
Patch's effect on generated qapi_event_send___org_qemu_x_event():
-void qapi_event_send___org_qemu_x_event(const char *__org_qemu_x_member2,
+void qapi_event_send___org_qemu_x_event(__org_qemu_x_Enum __org_qemu_x_member1,
+ const char *__org_qemu_x_member2,
Error **errp)
{
QDict *qmp;
@@ -224,6 +225,10 @@ void qapi_event_send___org_qemu_x_event(
goto clean;
}
+ visit_type___org_qemu_x_Enum(v, &__org_qemu_x_member1, "__org.qemu_x-member1", &local_err);
+ if (local_err) {
+ goto clean;
+ }
visit_type_str(v, (char **)&__org_qemu_x_member2, "__org.qemu_x-member2", &local_err);
if (local_err) {
goto clean;
Code is generated in a different order now, but that doesn't matter.
Backports commit 05f43a960877cf941635324b2d0a74c0d0f7128e from qemu
2018-02-19 22:16:27 +00:00
|
|
|
|
|
|
|
|
def visit_event(self, name, info, arg_type):
|
2018-02-19 23:27:47 +00:00
|
|
|
self.decl += gen_event_send_decl(name, arg_type)
|
|
|
|
|
self.defn += gen_event_send(name, arg_type)
|
qapi-event: Convert to QAPISchemaVisitor, fixing data with base
Fixes events whose data is struct with base to include the struct's
base members. Test case is qapi-schema-test.json's event
__org.qemu_x-command:
{ 'event': '__ORG.QEMU_X-EVENT', 'data': '__org.qemu_x-Struct' }
{ 'struct': '__org.qemu_x-Struct', 'base': '__org.qemu_x-Base',
'data': { '__org.qemu_x-member2': 'str' } }
{ 'struct': '__org.qemu_x-Base',
'data': { '__org.qemu_x-member1': '__org.qemu_x-Enum' } }
Patch's effect on generated qapi_event_send___org_qemu_x_event():
-void qapi_event_send___org_qemu_x_event(const char *__org_qemu_x_member2,
+void qapi_event_send___org_qemu_x_event(__org_qemu_x_Enum __org_qemu_x_member1,
+ const char *__org_qemu_x_member2,
Error **errp)
{
QDict *qmp;
@@ -224,6 +225,10 @@ void qapi_event_send___org_qemu_x_event(
goto clean;
}
+ visit_type___org_qemu_x_Enum(v, &__org_qemu_x_member1, "__org.qemu_x-member1", &local_err);
+ if (local_err) {
+ goto clean;
+ }
visit_type_str(v, (char **)&__org_qemu_x_member2, "__org.qemu_x-member2", &local_err);
if (local_err) {
goto clean;
Code is generated in a different order now, but that doesn't matter.
Backports commit 05f43a960877cf941635324b2d0a74c0d0f7128e from qemu
2018-02-19 22:16:27 +00:00
|
|
|
self._event_names.append(name)
|
|
|
|
|
|
2018-02-19 20:19:07 +00:00
|
|
|
(input_file, output_dir, do_c, do_h, prefix, dummy) = parse_command_line()
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-19 20:31:47 +00:00
|
|
|
c_comment = '''
|
2015-08-21 07:04:50 +00:00
|
|
|
/*
|
|
|
|
|
* schema-defined QAPI event functions
|
|
|
|
|
*
|
|
|
|
|
* Copyright (c) 2014 Wenchao Xia
|
|
|
|
|
*
|
|
|
|
|
* Authors:
|
|
|
|
|
* Wenchao Xia <wenchaoqemu@gmail.com>
|
|
|
|
|
*
|
|
|
|
|
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
|
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
|
|
|
*
|
|
|
|
|
*/
|
2018-02-19 20:31:47 +00:00
|
|
|
'''
|
|
|
|
|
h_comment = '''
|
2015-08-21 07:04:50 +00:00
|
|
|
/*
|
|
|
|
|
* schema-defined QAPI event functions
|
|
|
|
|
*
|
|
|
|
|
* Copyright (c) 2014 Wenchao Xia
|
|
|
|
|
*
|
|
|
|
|
* Authors:
|
|
|
|
|
* Wenchao Xia <wenchaoqemu@gmail.com>
|
|
|
|
|
*
|
|
|
|
|
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
|
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
|
|
|
*
|
|
|
|
|
*/
|
2018-02-19 20:31:47 +00:00
|
|
|
'''
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-19 20:31:47 +00:00
|
|
|
(fdef, fdecl) = open_output(output_dir, do_c, do_h, prefix,
|
|
|
|
|
'qapi-event.c', 'qapi-event.h',
|
|
|
|
|
c_comment, h_comment)
|
|
|
|
|
fdef.write(mcgen('''
|
|
|
|
|
#include "qemu-common.h"
|
|
|
|
|
#include "%(prefix)sqapi-event.h"
|
|
|
|
|
#include "%(prefix)sqapi-visit.h"
|
|
|
|
|
#include "qapi/qmp-output-visitor.h"
|
|
|
|
|
#include "qapi/qmp-event.h"
|
|
|
|
|
|
|
|
|
|
''',
|
|
|
|
|
prefix=prefix))
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-19 20:31:47 +00:00
|
|
|
fdecl.write(mcgen('''
|
2015-08-21 07:04:50 +00:00
|
|
|
#include "qapi/error.h"
|
|
|
|
|
#include "qapi/qmp/qdict.h"
|
|
|
|
|
#include "%(prefix)sqapi-types.h"
|
|
|
|
|
|
|
|
|
|
''',
|
2018-02-19 20:31:47 +00:00
|
|
|
prefix=prefix))
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-19 21:06:33 +00:00
|
|
|
event_enum_name = c_name(prefix + "QAPIEvent", protect=False)
|
qapi-event: Convert to QAPISchemaVisitor, fixing data with base
Fixes events whose data is struct with base to include the struct's
base members. Test case is qapi-schema-test.json's event
__org.qemu_x-command:
{ 'event': '__ORG.QEMU_X-EVENT', 'data': '__org.qemu_x-Struct' }
{ 'struct': '__org.qemu_x-Struct', 'base': '__org.qemu_x-Base',
'data': { '__org.qemu_x-member2': 'str' } }
{ 'struct': '__org.qemu_x-Base',
'data': { '__org.qemu_x-member1': '__org.qemu_x-Enum' } }
Patch's effect on generated qapi_event_send___org_qemu_x_event():
-void qapi_event_send___org_qemu_x_event(const char *__org_qemu_x_member2,
+void qapi_event_send___org_qemu_x_event(__org_qemu_x_Enum __org_qemu_x_member1,
+ const char *__org_qemu_x_member2,
Error **errp)
{
QDict *qmp;
@@ -224,6 +225,10 @@ void qapi_event_send___org_qemu_x_event(
goto clean;
}
+ visit_type___org_qemu_x_Enum(v, &__org_qemu_x_member1, "__org.qemu_x-member1", &local_err);
+ if (local_err) {
+ goto clean;
+ }
visit_type_str(v, (char **)&__org_qemu_x_member2, "__org.qemu_x-member2", &local_err);
if (local_err) {
goto clean;
Code is generated in a different order now, but that doesn't matter.
Backports commit 05f43a960877cf941635324b2d0a74c0d0f7128e from qemu
2018-02-19 22:16:27 +00:00
|
|
|
|
|
|
|
|
schema = QAPISchema(input_file)
|
|
|
|
|
gen = QAPISchemaGenEventVisitor()
|
|
|
|
|
schema.visit(gen)
|
|
|
|
|
fdef.write(gen.defn)
|
|
|
|
|
fdecl.write(gen.decl)
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-19 20:31:47 +00:00
|
|
|
close_output(fdef, fdecl)
|
