[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/30] qapi job: Elide redundant has_FOO in generated C
From: |
Markus Armbruster |
Subject: |
[PULL 14/30] qapi job: Elide redundant has_FOO in generated C |
Date: |
Wed, 14 Dec 2022 08:47:05 +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/job.json.
Said commit explains the transformation in more detail. The invariant
violations mentioned there do not occur here.
Cc: John Snow <jsnow@redhat.com>
Cc: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Cc: qemu-block@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-Id: <20221104160712.3005652-15-armbru@redhat.com>
---
job-qmp.c | 3 +--
scripts/qapi/schema.py | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/job-qmp.c b/job-qmp.c
index d498fc89c0..9e26fa899f 100644
--- a/job-qmp.c
+++ b/job-qmp.c
@@ -156,8 +156,7 @@ static JobInfo *job_query_single_locked(Job *job, Error
**errp)
.status = job->status,
.current_progress = progress_current,
.total_progress = progress_total,
- .has_error = !!job->err,
- .error = job->err ? \
+ .error = job->err ?
g_strdup(error_get_pretty(job->err)) : NULL,
};
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 07e2a0f263..ff73fdb0b3 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/job.json',
'qapi/machine.json',
'qapi/machine-target.json',
'qapi/migration.json',
--
2.37.3
- [PULL 15/30] qapi machine: Elide redundant has_FOO in generated C, (continued)
- [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, 2022/12/14
- [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 <=
- [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, 2022/12/14
- Re: [PULL 00/30] QAPI patches patches for 2022-12-14, Peter Maydell, 2022/12/14