Re: [PATCH 22/27] qapi stats: Elide redundant has_FOO in generated C

[Mark Kanda]

On 9/15/2022 3:43 PM, Markus Armbruster wrote:

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 
Cc: Paolo Bonzini 
Signed-off-by: Markus Armbruster 


Reviewed-by:  Mark Kanda 

Thanks/regards,
-Mark


---
  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 672fc5d1cc..21a21d6171 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 3001b715d0..6f35e57fe2 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',

[PATCH 22/27] qapi stats: Elide redundant has_FOO in generated C

[Markus Armbruster]

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 
Cc: Paolo Bonzini 
Signed-off-by: Markus Armbruster 
---
 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 672fc5d1cc..21a21d6171 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 3001b715d0..6f35e57fe2 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.2