From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Mark Kanda" <mark.kanda@oracle.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 24/30] qapi stats: Elide redundant has_FOO in generated C
Date: Wed, 14 Dec 2022 08:47:15 +0100 [thread overview]
Message-ID: <20221214074721.731441-27-armbru@redhat.com> (raw)
In-Reply-To: <20221214074721.731441-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/stats.json.
Said commit explains the transformation in more detail. The invariant
violations mentioned there do not occur here.
Cc: Mark Kanda <mark.kanda@oracle.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Mark Kanda <mark.kanda@oracle.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221104160712.3005652-25-armbru@redhat.com>
---
monitor/qmp-cmds.c | 5 +----
scripts/qapi/schema.py | 1 -
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index f8ab5dd50f..3bf2ae9bb7 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -560,10 +560,7 @@ void add_stats_entry(StatsResultList **stats_results, StatsProvider provider,
StatsResult *entry = g_new0(StatsResult, 1);
entry->provider = provider;
- if (qom_path) {
- entry->has_qom_path = true;
- entry->qom_path = g_strdup(qom_path);
- }
+ entry->qom_path = g_strdup(qom_path);
entry->stats = stats_list;
QAPI_LIST_PREPEND(*stats_results, entry);
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index f405ab7f49..0544037e71 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/stats.json',
'qapi/tpm.json',
'qapi/transaction.json',
'qapi/ui.json',
--
2.37.3
next prev parent reply other threads:[~2022-12-14 8:51 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-14 7:46 [PULL 00/30] QAPI patches patches for 2022-12-14 Markus Armbruster
2022-12-14 7:46 ` [PULL 01/30] docs/devel/qapi-code-gen: Update example to match current code Markus Armbruster
2022-12-14 7:46 ` [PATCH 1/2] include/hw/virtio: Break inclusion loop Markus Armbruster
2022-12-14 7:49 ` Markus Armbruster
2022-12-14 7:46 ` [PATCH 2/2] include: Include headers where needed Markus Armbruster
2022-12-14 7:49 ` Markus Armbruster
2022-12-14 7:46 ` [PULL 02/30] qapi: Tidy up whitespace in generated code Markus Armbruster
2022-12-14 7:46 ` [PULL 03/30] docs/devel/qapi-code-gen: Extend example for next commit's change Markus Armbruster
2022-12-14 7:46 ` [PULL 04/30] qapi: Start to elide redundant has_FOO in generated C Markus Armbruster
2022-12-14 7:46 ` [PULL 05/30] qapi tests: Elide " Markus Armbruster
2022-12-14 7:46 ` [PULL 06/30] qapi acpi: " Markus Armbruster
2022-12-14 7:46 ` [PULL 07/30] qapi audio: " Markus Armbruster
2022-12-14 7:46 ` [PULL 08/30] blockdev: Clean up abuse of DriveBackup member format Markus Armbruster
2022-12-14 7:47 ` [PULL 09/30] nbd/server: Clean up abuse of BlockExportOptionsNbd member @arg Markus Armbruster
2022-12-14 7:47 ` [PULL 10/30] qapi block: Elide redundant has_FOO in generated C Markus Armbruster
2022-12-14 7:47 ` [PULL 11/30] qapi chardev: " Markus Armbruster
2022-12-14 7:47 ` [PULL 12/30] qapi crypto: " Markus Armbruster
2022-12-14 7:47 ` [PULL 13/30] qapi dump: " Markus Armbruster
2022-12-14 7:47 ` [PULL 14/30] qapi job: " Markus Armbruster
2022-12-14 7:47 ` [PULL 15/30] qapi machine: " Markus Armbruster
2022-12-14 7:47 ` [PULL 16/30] qapi migration: " Markus Armbruster
2022-12-14 7:47 ` [PULL 17/30] qapi misc: " Markus Armbruster
2022-12-14 7:47 ` [PULL 18/30] qapi net: " Markus Armbruster
2022-12-14 7:47 ` [PULL 19/30] qapi pci: " Markus Armbruster
2022-12-14 7:47 ` [PULL 20/30] qapi qdev qom: " Markus Armbruster
2022-12-14 7:47 ` [PULL 21/30] qapi replay: " Markus Armbruster
2022-12-14 7:47 ` [PULL 22/30] qapi rocker: " Markus Armbruster
2022-12-14 7:47 ` [PULL 23/30] qapi run-state: " Markus Armbruster
2022-12-14 7:47 ` Markus Armbruster [this message]
2022-12-14 7:47 ` [PULL 25/30] qapi tpm: " Markus Armbruster
2022-12-14 7:47 ` [PULL 26/30] qapi transaction: " Markus Armbruster
2022-12-14 7:47 ` [PULL 27/30] qapi ui: " Markus Armbruster
2022-12-14 7:47 ` [PULL 28/30] qapi virtio: " Markus Armbruster
2022-12-14 7:47 ` [PULL 29/30] qapi qga: " Markus Armbruster
2022-12-14 7:47 ` [PULL 30/30] qapi: Drop temporary logic to support conversion step by step Markus Armbruster
2022-12-14 17:03 ` [PULL 00/30] QAPI patches patches for 2022-12-14 Peter Maydell
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=20221214074721.731441-27-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=mark.kanda@oracle.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.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).