qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: michael.roth@amd.com, jsnow@redhat.com, eblake@redhat.com,
	"Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PATCH v2 03/28] docs/devel/qapi-code-gen: Extend example for next commit's change
Date: Tue, 18 Oct 2022 08:28:24 +0200	[thread overview]
Message-ID: <20221018062849.3420573-4-armbru@redhat.com> (raw)
In-Reply-To: <20221018062849.3420573-1-armbru@redhat.com>

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>
---
 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.2



  parent reply	other threads:[~2022-10-18  6:47 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-18  6:28 [PATCH v2 00/28] qapi: Elide redundant has_FOO in generated C Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 01/28] docs/devel/qapi-code-gen: Update example to match current code Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 02/28] qapi: Tidy up whitespace in generated code Markus Armbruster
2022-10-18  6:28 ` Markus Armbruster [this message]
2022-10-18  6:28 ` [PATCH v2 04/28] qapi: Start to elide redundant has_FOO in generated C Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 05/28] qapi tests: Elide " Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 06/28] qapi acpi: " Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 07/28] qapi audio: " Markus Armbruster
2022-10-18 12:15   ` Philippe Mathieu-Daudé
2022-10-18  6:28 ` [PATCH v2 08/28] qapi block: " Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 09/28] qapi char: " Markus Armbruster
2022-10-18 12:14   ` Philippe Mathieu-Daudé
2022-10-18 12:55     ` Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 10/28] qapi crypto: " Markus Armbruster
2022-10-18 11:57   ` Philippe Mathieu-Daudé
2022-10-18  6:28 ` [PATCH v2 11/28] qapi dump: " Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 12/28] qapi job: " Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 13/28] qapi machine: " Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 14/28] qapi migration: " Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 15/28] qapi misc: " Markus Armbruster
2022-10-18 10:32   ` Dr. David Alan Gilbert
2022-10-18 11:10     ` Markus Armbruster
2022-10-18 11:17       ` Dr. David Alan Gilbert
2022-10-18 13:01         ` Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 16/28] qapi net: " Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 17/28] qapi pci: " Markus Armbruster
2022-10-18 12:12   ` Philippe Mathieu-Daudé
2022-10-18  6:28 ` [PATCH v2 18/28] qapi qdev qom: " Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 19/28] qapi replay: " Markus Armbruster
2022-10-18 12:11   ` Philippe Mathieu-Daudé
2022-10-18  6:28 ` [PATCH v2 20/28] qapi rocker: " Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 21/28] qapi run-state: " Markus Armbruster
2022-10-18 12:11   ` Philippe Mathieu-Daudé
2022-10-18 13:04     ` Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 22/28] qapi stats: " Markus Armbruster
2022-10-18 12:02   ` Philippe Mathieu-Daudé
2022-10-18  6:28 ` [PATCH v2 23/28] qapi tpm: " Markus Armbruster
2022-10-18 12:01   ` Philippe Mathieu-Daudé
2022-10-18 12:12     ` Stefan Berger
2022-10-18 12:23       ` Philippe Mathieu-Daudé
2022-10-18 13:06         ` Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 24/28] qapi transaction: " Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 25/28] qapi ui: " Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 26/28] qapi virtio: " Markus Armbruster
2022-10-18 12:04   ` Philippe Mathieu-Daudé
2022-10-18  6:28 ` [PATCH v2 27/28] qapi qga: " Markus Armbruster
2022-10-18  6:28 ` [PATCH v2 28/28] qapi: Drop temporary logic to support conversion step by step Markus Armbruster
2022-10-18 12:03   ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221018062849.3420573-4-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=eblake@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=michael.roth@amd.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).