[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/27] qapi job: Elide redundant has_FOO in generated C
From: |
Markus Armbruster |
Subject: |
[PATCH 12/27] qapi job: Elide redundant has_FOO in generated C |
Date: |
Thu, 15 Sep 2022 22:43:02 +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/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>
---
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 829a28aa70..f3c89c6db7 100644
--- a/job-qmp.c
+++ b/job-qmp.c
@@ -158,8 +158,7 @@ static JobInfo *job_query_single(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 2cdea9b3b6..765636a1a5 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.2
- Re: [PATCH 07/27] qapi audio: Elide redundant has_FOO in generated C, (continued)
- [PATCH 14/27] qapi migration: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15
- [PATCH 03/27] docs/devel/qapi-code-gen: Extend example for next commit's change, Markus Armbruster, 2022/09/15
- [PATCH 21/27] qapi run-state: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15
- [PATCH 24/27] qapi transaction: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15
- [PATCH 12/27] qapi job: Elide redundant has_FOO in generated C,
Markus Armbruster <=
- [PATCH 18/27] qapi qdev qom: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15
- [PATCH 16/27] qapi net: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15
- [PATCH 23/27] qapi tpm: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15
- [PATCH 20/27] qapi rocker: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15
- [PATCH 01/27] docs/devel/qapi-code-gen: Update example to match current code, Markus Armbruster, 2022/09/15
- [PATCH 06/27] qapi acpi: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/09/15