qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: jsnow@redhat.com, eblake@redhat.com, michael.roth@amd.com,
	Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>,
	qemu-block@nongnu.org
Subject: [PATCH v3 26/30] qapi transaction: Elide redundant has_FOO in generated C
Date: Fri,  4 Nov 2022 17:07:08 +0100	[thread overview]
Message-ID: <20221104160712.3005652-27-armbru@redhat.com> (raw)
In-Reply-To: <20221104160712.3005652-1-armbru@redhat.com>

The has_FOO for pointer-valued FOO are redundant, except for arrays.
They are also a nuisance to work with.  Recent commit "qapi: Start to
elide redundant has_FOO in generated C" provided the means to elide
them step by step.  This is the step for qapi/transaction.json.

Said commit explains the transformation in more detail.  The invariant
violations mentioned there do not occur here.

In qmp_transaction(), we can't just drop parameter @has_props, since
it's used to track whether @props needs to be freed.  Replace it by a
local variable.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Hanna Reitz <hreitz@redhat.com>
Cc: qemu-block@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 blockdev.c             | 4 ++--
 scripts/qapi/schema.py | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/blockdev.c b/blockdev.c
index 59753400e9..75eef8535e 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1048,7 +1048,7 @@ static void blockdev_do_action(TransactionAction *action, Error **errp)
 
     list.value = action;
     list.next = NULL;
-    qmp_transaction(&list, false, NULL, errp);
+    qmp_transaction(&list, NULL, errp);
 }
 
 void qmp_blockdev_snapshot_sync(const char *device, const char *node_name,
@@ -2289,11 +2289,11 @@ static TransactionProperties *get_transaction_properties(
  * Always run under BQL.
  */
 void qmp_transaction(TransactionActionList *dev_list,
-                     bool has_props,
                      struct TransactionProperties *props,
                      Error **errp)
 {
     TransactionActionList *dev_entry = dev_list;
+    bool has_props = !!props;
     JobTxn *block_job_txn = NULL;
     BlkActionState *state, *next;
     Error *local_err = NULL;
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index f0726af876..3673296ad8 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -759,7 +759,6 @@ def need_has(self):
         assert self.type
         # Temporary hack to support dropping the has_FOO in reviewable chunks
         opt_out = [
-            'qapi/transaction.json',
             'qapi/ui.json',
             'qapi/virtio.json',
             'qga/qapi-schema.json']
-- 
2.37.3



  parent reply	other threads:[~2022-11-04 16:11 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-04 16:06 [PATCH v3 00/30] qapi: Elide redundant has_FOO in generated C Markus Armbruster
2022-11-04 16:06 ` [PATCH v3 01/30] docs/devel/qapi-code-gen: Update example to match current code Markus Armbruster
2022-11-04 16:06 ` [PATCH v3 02/30] qapi: Tidy up whitespace in generated code Markus Armbruster
2022-11-04 16:06 ` [PATCH v3 03/30] docs/devel/qapi-code-gen: Extend example for next commit's change Markus Armbruster
2022-11-04 16:06 ` [PATCH v3 04/30] qapi: Start to elide redundant has_FOO in generated C Markus Armbruster
2022-11-04 16:06 ` [PATCH v3 05/30] qapi tests: Elide " Markus Armbruster
2022-11-04 16:06 ` [PATCH v3 06/30] qapi acpi: " Markus Armbruster
2022-11-04 16:06 ` [PATCH v3 07/30] qapi audio: " Markus Armbruster
2022-11-04 16:06 ` [PATCH v3 08/30] blockdev: Clean up abuse of DriveBackup member format Markus Armbruster
2022-11-04 19:32   ` Eric Blake
2022-11-04 16:06 ` [PATCH v3 09/30] nbd/server: Clean up abuse of BlockExportOptionsNbd member @arg Markus Armbruster
2022-11-04 19:35   ` Eric Blake
2022-11-08 14:21   ` Vladimir Sementsov-Ogievskiy
2022-11-04 16:06 ` [PATCH v3 10/30] qapi block: Elide redundant has_FOO in generated C Markus Armbruster
2022-11-04 16:06 ` [PATCH v3 11/30] qapi chardev: " Markus Armbruster
2022-11-04 16:06 ` [PATCH v3 12/30] qapi crypto: " Markus Armbruster
2022-11-04 16:06 ` [PATCH v3 13/30] qapi dump: " Markus Armbruster
2022-11-05 17:15   ` Philippe Mathieu-Daudé
2022-11-04 16:06 ` [PATCH v3 14/30] qapi job: " Markus Armbruster
2022-11-04 16:06 ` [PATCH v3 15/30] qapi machine: " Markus Armbruster
2022-11-04 16:06 ` [PATCH v3 16/30] qapi migration: " Markus Armbruster
2022-11-04 16:06 ` [PATCH v3 17/30] qapi misc: " Markus Armbruster
2022-11-04 16:07 ` [PATCH v3 18/30] qapi net: " Markus Armbruster
2022-11-05 17:03   ` Philippe Mathieu-Daudé
2022-11-04 16:07 ` [PATCH v3 19/30] qapi pci: " Markus Armbruster
2022-11-04 16:07 ` [PATCH v3 20/30] qapi qdev qom: " Markus Armbruster
2022-11-05 17:06   ` Philippe Mathieu-Daudé
2022-11-04 16:07 ` [PATCH v3 21/30] qapi replay: " Markus Armbruster
2022-11-04 16:07 ` [PATCH v3 22/30] qapi rocker: " Markus Armbruster
2022-11-05 17:08   ` Philippe Mathieu-Daudé
2022-11-04 16:07 ` [PATCH v3 23/30] qapi run-state: " Markus Armbruster
2022-11-04 16:07 ` [PATCH v3 24/30] qapi stats: " Markus Armbruster
2022-11-04 16:07 ` [PATCH v3 25/30] qapi tpm: " Markus Armbruster
2022-11-04 16:07 ` Markus Armbruster [this message]
2022-11-05 17:08   ` [PATCH v3 26/30] qapi transaction: " Philippe Mathieu-Daudé
2022-11-04 16:07 ` [PATCH v3 27/30] qapi ui: " Markus Armbruster
2022-11-04 16:07 ` [PATCH v3 28/30] qapi virtio: " Markus Armbruster
2022-11-04 16:07 ` [PATCH v3 29/30] qapi qga: " Markus Armbruster
2022-11-05 17:13   ` Philippe Mathieu-Daudé
2022-11-04 16:07 ` [PATCH v3 30/30] qapi: Drop temporary logic to support conversion step by step Markus Armbruster
2022-11-04 16:15 ` [PATCH v3 00/30] qapi: Elide redundant has_FOO in generated C Markus Armbruster

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=20221104160712.3005652-27-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=eblake@redhat.com \
    --cc=hreitz@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=michael.roth@amd.com \
    --cc=qemu-block@nongnu.org \
    --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).