aboutsummaryrefslogtreecommitdiff
path: root/softmmu
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2022-11-04 17:07:05 +0100
committerMarkus Armbruster <armbru@redhat.com>2022-12-14 20:05:07 +0100
commit0ccc2c92ebee7a2563e6615b0f7bae0a56a48dad (patch)
tree39432f278534f49908cc7a6df413456857ad2032 /softmmu
parent05e074886052acccb65f7df73ae4bbe7923e01bc (diff)
downloadqemu-0ccc2c92ebee7a2563e6615b0f7bae0a56a48dad.zip
qemu-0ccc2c92ebee7a2563e6615b0f7bae0a56a48dad.tar.gz
qemu-0ccc2c92ebee7a2563e6615b0f7bae0a56a48dad.tar.bz2
qapi run-state: Elide redundant has_FOO in generated C
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> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-Id: <20221104160712.3005652-24-armbru@redhat.com>
Diffstat (limited to 'softmmu')
-rw-r--r--softmmu/runstate.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/softmmu/runstate.c b/softmmu/runstate.c
index 3dd83d5..cab9f6f 100644
--- a/softmmu/runstate.c
+++ b/softmmu/runstate.c
@@ -484,18 +484,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) {
@@ -522,13 +519,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)