[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/30] docs/devel/qapi-code-gen: Extend example for next commit's
From: |
Markus Armbruster |
Subject: |
[PULL 03/30] docs/devel/qapi-code-gen: Extend example for next commit's change |
Date: |
Wed, 14 Dec 2022 08:46:54 +0100 |
The next commit will change the code generated for some optional
members. The example schema contains an optional member affected by
the change. Add one that is not affected.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20221104160712.3005652-4-armbru@redhat.com>
---
docs/devel/qapi-code-gen.rst | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/docs/devel/qapi-code-gen.rst b/docs/devel/qapi-code-gen.rst
index b56ea4546d..3a817ba498 100644
--- a/docs/devel/qapi-code-gen.rst
+++ b/docs/devel/qapi-code-gen.rst
@@ -1357,7 +1357,7 @@ qmp_my_command(); everything else is produced by the
generator. ::
$ cat example-schema.json
{ 'struct': 'UserDefOne',
- 'data': { 'integer': 'int', '*string': 'str' } }
+ 'data': { 'integer': 'int', '*string': 'str', '*flag': 'bool' } }
{ 'command': 'my-command',
'data': { 'arg1': ['UserDefOne'] },
@@ -1412,6 +1412,8 @@ Example::
int64_t integer;
bool has_string;
char *string;
+ bool has_flag;
+ bool flag;
};
void qapi_free_UserDefOne(UserDefOne *obj);
@@ -1531,6 +1533,11 @@ Example::
return false;
}
}
+ if (visit_optional(v, "flag", &obj->has_flag)) {
+ if (!visit_type_bool(v, "flag", &obj->flag, errp)) {
+ return false;
+ }
+ }
return true;
}
@@ -1916,6 +1923,12 @@ Example::
{ "type", QLIT_QSTR("str"), },
{}
})),
+ QLIT_QDICT(((QLitDictEntry[]) {
+ { "default", QLIT_QNULL, },
+ { "name", QLIT_QSTR("flag"), },
+ { "type", QLIT_QSTR("bool"), },
+ {}
+ })),
{}
})), },
{ "meta-type", QLIT_QSTR("object"), },
@@ -1949,6 +1962,12 @@ Example::
{ "name", QLIT_QSTR("str"), },
{}
})),
+ QLIT_QDICT(((QLitDictEntry[]) {
+ { "json-type", QLIT_QSTR("boolean"), },
+ { "meta-type", QLIT_QSTR("builtin"), },
+ { "name", QLIT_QSTR("bool"), },
+ {}
+ })),
{}
}));
--
2.37.3
- [PULL 00/30] QAPI patches patches for 2022-12-14, Markus Armbruster, 2022/12/14
- [PATCH 2/2] include: Include headers where needed, Markus Armbruster, 2022/12/14
- [PULL 05/30] qapi tests: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 03/30] docs/devel/qapi-code-gen: Extend example for next commit's change,
Markus Armbruster <=
- [PULL 01/30] docs/devel/qapi-code-gen: Update example to match current code, Markus Armbruster, 2022/12/14
- [PULL 04/30] qapi: Start to elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 11/30] qapi chardev: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 28/30] qapi virtio: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 16/30] qapi migration: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 07/30] qapi audio: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 22/30] qapi rocker: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 12/30] qapi crypto: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 02/30] qapi: Tidy up whitespace in generated code, Markus Armbruster, 2022/12/14
- [PULL 19/30] qapi pci: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14