[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 22/28] qapi stats: Elide redundant has_FOO in generated C
From: |
Markus Armbruster |
Subject: |
[PULL v2 22/28] qapi stats: Elide redundant has_FOO in generated C |
Date: |
Wed, 26 Oct 2022 20:35:26 +0200 |
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>
Message-Id: <20221018062849.3420573-23-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
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
- [PULL v2 09/28] qapi chardev: Elide redundant has_FOO in generated C, (continued)
- [PULL v2 09/28] qapi chardev: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 16/28] qapi net: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 24/28] qapi transaction: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 13/28] qapi machine: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 17/28] qapi pci: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 10/28] qapi crypto: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 18/28] qapi qdev qom: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 21/28] qapi run-state: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 28/28] qapi: Drop temporary logic to support conversion step by step, Markus Armbruster, 2022/10/26
- [PULL v2 12/28] qapi job: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 22/28] qapi stats: Elide redundant has_FOO in generated C,
Markus Armbruster <=
- [PULL v2 08/28] qapi block: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 23/28] qapi tpm: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 19/28] qapi replay: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- Re: [PULL v2 00/28] QAPI patches patches for 2022-10-25, Stefan Hajnoczi, 2022/10/30