[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 21/28] qapi run-state: Elide redundant has_FOO in generated C
From: |
Markus Armbruster |
Subject: |
[PULL v2 21/28] qapi run-state: Elide redundant has_FOO in generated C |
Date: |
Wed, 26 Oct 2022 20:35:25 +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/run-state.json.
Said commit explains the transformation in more detail. The invariant
violations mentioned there do not occur here.
Drop a superfluous conditional around
qapi_free_GuestPanicInformation() while there.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20221018062849.3420573-22-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
[Commit message tweaked]
---
softmmu/runstate.c | 18 +++++-------------
scripts/qapi/schema.py | 1 -
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/softmmu/runstate.c b/softmmu/runstate.c
index 1e68680b9d..682a810d3c 100644
--- a/softmmu/runstate.c
+++ b/softmmu/runstate.c
@@ -479,18 +479,15 @@ void qemu_system_guest_panicked(GuestPanicInformation
*info)
*/
if (panic_action == PANIC_ACTION_PAUSE
|| (panic_action == PANIC_ACTION_SHUTDOWN && shutdown_action ==
SHUTDOWN_ACTION_PAUSE)) {
- qapi_event_send_guest_panicked(GUEST_PANIC_ACTION_PAUSE,
- !!info, info);
+ qapi_event_send_guest_panicked(GUEST_PANIC_ACTION_PAUSE, info);
vm_stop(RUN_STATE_GUEST_PANICKED);
} else if (panic_action == PANIC_ACTION_SHUTDOWN ||
panic_action == PANIC_ACTION_EXIT_FAILURE) {
- qapi_event_send_guest_panicked(GUEST_PANIC_ACTION_POWEROFF,
- !!info, info);
+ qapi_event_send_guest_panicked(GUEST_PANIC_ACTION_POWEROFF, info);
vm_stop(RUN_STATE_GUEST_PANICKED);
qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_PANIC);
} else {
- qapi_event_send_guest_panicked(GUEST_PANIC_ACTION_RUN,
- !!info, info);
+ qapi_event_send_guest_panicked(GUEST_PANIC_ACTION_RUN, info);
}
if (info) {
@@ -517,13 +514,8 @@ void qemu_system_guest_panicked(GuestPanicInformation
*info)
void qemu_system_guest_crashloaded(GuestPanicInformation *info)
{
qemu_log_mask(LOG_GUEST_ERROR, "Guest crash loaded");
-
- qapi_event_send_guest_crashloaded(GUEST_PANIC_ACTION_RUN,
- !!info, info);
-
- if (info) {
- qapi_free_GuestPanicInformation(info);
- }
+ qapi_event_send_guest_crashloaded(GUEST_PANIC_ACTION_RUN, info);
+ qapi_free_GuestPanicInformation(info);
}
void qemu_system_reset_request(ShutdownCause reason)
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 1b3195bc87..f405ab7f49 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/run-state.json',
'qapi/stats.json',
'qapi/tpm.json',
'qapi/transaction.json',
--
2.37.3
- [PULL v2 27/28] qapi qga: Elide redundant has_FOO in generated C, (continued)
- [PULL v2 27/28] qapi qga: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 05/28] qapi tests: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 20/28] qapi rocker: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 09/28] qapi chardev: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 16/28] qapi net: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 24/28] qapi transaction: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 13/28] qapi machine: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 17/28] qapi pci: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 10/28] qapi crypto: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 18/28] qapi qdev qom: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 21/28] qapi run-state: Elide redundant has_FOO in generated C,
Markus Armbruster <=
- [PULL v2 28/28] qapi: Drop temporary logic to support conversion step by step, Markus Armbruster, 2022/10/26
- [PULL v2 12/28] qapi job: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 22/28] qapi stats: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 08/28] qapi block: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 23/28] qapi tpm: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- [PULL v2 19/28] qapi replay: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/10/26
- Re: [PULL v2 00/28] QAPI patches patches for 2022-10-25, Stefan Hajnoczi, 2022/10/30