[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/30] qapi dump: Elide redundant has_FOO in generated C
From: |
Markus Armbruster |
Subject: |
[PULL 13/30] qapi dump: Elide redundant has_FOO in generated C |
Date: |
Wed, 14 Dec 2022 08:47:04 +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/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: <20221104160712.3005652-14-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
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 df117c847f..1278dc35f9 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -2044,8 +2044,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 02/30] qapi: Tidy up whitespace in generated code, (continued)
- [PULL 02/30] qapi: Tidy up whitespace in generated code, Markus Armbruster, 2022/12/14
- [PULL 19/30] qapi pci: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 15/30] qapi machine: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 17/30] qapi misc: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 25/30] qapi tpm: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 10/30] qapi block: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 06/30] qapi acpi: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 08/30] blockdev: Clean up abuse of DriveBackup member format, Markus Armbruster, 2022/12/14
- [PULL 23/30] qapi run-state: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 27/30] qapi ui: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 13/30] qapi dump: Elide redundant has_FOO in generated C,
Markus Armbruster <=
- [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