[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/28] qapi dump: Elide redundant has_FOO in generated C
From: |
Markus Armbruster |
Subject: |
[PULL 11/28] qapi dump: Elide redundant has_FOO in generated C |
Date: |
Tue, 25 Oct 2022 10:05:24 +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/dump.json.
Said commit explains the transformation in more detail. The invariant
violations mentioned there do not occur here.
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20221018062849.3420573-12-armbru@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
- [PULL 00/28] QAPI patches patches for 2022-10-25, Markus Armbruster, 2022/10/25
- [PULL 04/28] qapi: Start to elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/25
- [PULL 19/28] qapi replay: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/25
- [PULL 13/28] qapi machine: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/25
- [PULL 11/28] qapi dump: Elide redundant has_FOO in generated C,
Markus Armbruster <=
- [PULL 01/28] docs/devel/qapi-code-gen: Update example to match current code, Markus Armbruster, 2022/10/25
- [PULL 07/28] qapi audio: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/25
- [PULL 18/28] qapi qdev qom: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/25
- [PULL 08/28] qapi block: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/25
- [PULL 25/28] qapi ui: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/25
- [PULL 26/28] qapi virtio: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/25
- [PULL 20/28] qapi rocker: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/25
- [PULL 14/28] qapi migration: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/25
- [PULL 05/28] qapi tests: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/25
- [PULL 06/28] qapi acpi: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/25