[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/30] qapi stats: Elide redundant has_FOO in generated C
From: |
Markus Armbruster |
Subject: |
[PULL 24/30] qapi stats: Elide redundant has_FOO in generated C |
Date: |
Wed, 14 Dec 2022 08:47:15 +0100 |
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
- [PULL 29/30] qapi qga: Elide redundant has_FOO in generated C, (continued)
- [PULL 29/30] qapi qga: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 14/30] qapi job: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 26/30] qapi transaction: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 21/30] qapi replay: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 30/30] qapi: Drop temporary logic to support conversion step by step, Markus Armbruster, 2022/12/14
- [PULL 18/30] qapi net: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 20/30] qapi qdev qom: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 09/30] nbd/server: Clean up abuse of BlockExportOptionsNbd member @arg, Markus Armbruster, 2022/12/14
- [PATCH 1/2] include/hw/virtio: Break inclusion loop, Markus Armbruster, 2022/12/14
- [PULL 24/30] qapi stats: Elide redundant has_FOO in generated C,
Markus Armbruster <=
- Re: [PULL 00/30] QAPI patches patches for 2022-12-14, Peter Maydell, 2022/12/14