On 08/28/2018 07:27 AM, Markus Armbruster wrote:
--- v2: rebase on conditional code additions, drop patch to remove -u, update documentation to match
My update wasn't very accurate, as you discovered :)
Let's rebase onto my "[PATCH 0/2] qapi: A whitespace touch-up, and a doc update". The appended fixup needs to be squashed in then. Happy to do that in my tree.
Yes, that makes the most sense. Go ahead!
Reviewed-by: Markus Armbruster <arm...@redhat.com> diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt index a4091a7d78..f9990808de 100644 --- a/docs/devel/qapi-code-gen.txt +++ b/docs/devel/qapi-code-gen.txt @@ -1430,7 +1430,7 @@ Example: { "name", QLIT_QSTR("MY_EVENT"), }, {} })), - /* "0" = q_empty */ + /* "0" = q_obj_my-command-arg */ QLIT_QDICT(((QLitDictEntry[]) { { "members", QLIT_QLIST(((QLitObject[]) { QLIT_QDICT(((QLitDictEntry[]) { @@ -1444,6 +1444,7 @@ Example: { "name", QLIT_QSTR("0"), }, {} })), + /* "1" = UserDefOne */ QLIT_QDICT(((QLitDictEntry[]) { { "members", QLIT_QLIST(((QLitObject[]) { QLIT_QDICT(((QLitDictEntry[]) { @@ -1463,6 +1464,7 @@ Example: { "name", QLIT_QSTR("1"), }, {} })), + /* "2" = q_empty */ QLIT_QDICT(((QLitDictEntry[]) { { "members", QLIT_QLIST(((QLitObject[]) { {}
-- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org