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/dump.json.
Said commit explains the transformation in more detail. The invariant
violations mentioned there do not occur here.
Cc: Marc-André Lureau <marcandre.lur...@redhat.com>
Signed-off-by: Markus Armbruster <arm...@redhat.com>
Message-Id: <20221018062849.3420573-12-arm...@redhat.com>
---
dump/dump.c | 4 ++--
scripts/qapi/schema.py | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dump/dump.c b/dump/dump.c
index 236559b03a..3baf625967 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -1884,8 +1884,8 @@ static void dump_process(DumpState *s, Error **errp)
result = qmp_query_dump(NULL);
/* should never fail */
assert(result);
- qapi_event_send_dump_completed(result, !!*errp, (*errp ?
- error_get_pretty(*errp) :
NULL));
+ qapi_event_send_dump_completed(result,
+ *errp ? error_get_pretty(*errp) : NULL);
qapi_free_DumpQueryResult(result);
dump_cleanup(s);
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 21d0b28790..07e2a0f263 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/dump.json',
'qapi/job.json',
'qapi/machine.json',
'qapi/machine-target.json',
--
2.37.3
