qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 23/30] qapi run-state: Elide redundant has_FOO in generated C
Date: Wed, 14 Dec 2022 08:47:14 +0100	[thread overview]
Message-ID: <20221214074721.731441-26-armbru@redhat.com> (raw)
In-Reply-To: <20221214074721.731441-1-armbru@redhat.com>

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>
---
 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 3dd83d5e5d..cab9f6fc07 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)
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



  parent reply	other threads:[~2022-12-14  8:11 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-14  7:46 [PULL 00/30] QAPI patches patches for 2022-12-14 Markus Armbruster
2022-12-14  7:46 ` [PULL 01/30] docs/devel/qapi-code-gen: Update example to match current code Markus Armbruster
2022-12-14  7:46 ` [PATCH 1/2] include/hw/virtio: Break inclusion loop Markus Armbruster
2022-12-14  7:49   ` Markus Armbruster
2022-12-14  7:46 ` [PATCH 2/2] include: Include headers where needed Markus Armbruster
2022-12-14  7:49   ` Markus Armbruster
2022-12-14  7:46 ` [PULL 02/30] qapi: Tidy up whitespace in generated code Markus Armbruster
2022-12-14  7:46 ` [PULL 03/30] docs/devel/qapi-code-gen: Extend example for next commit's change Markus Armbruster
2022-12-14  7:46 ` [PULL 04/30] qapi: Start to elide redundant has_FOO in generated C Markus Armbruster
2022-12-14  7:46 ` [PULL 05/30] qapi tests: Elide " Markus Armbruster
2022-12-14  7:46 ` [PULL 06/30] qapi acpi: " Markus Armbruster
2022-12-14  7:46 ` [PULL 07/30] qapi audio: " Markus Armbruster
2022-12-14  7:46 ` [PULL 08/30] blockdev: Clean up abuse of DriveBackup member format Markus Armbruster
2022-12-14  7:47 ` [PULL 09/30] nbd/server: Clean up abuse of BlockExportOptionsNbd member @arg Markus Armbruster
2022-12-14  7:47 ` [PULL 10/30] qapi block: Elide redundant has_FOO in generated C Markus Armbruster
2022-12-14  7:47 ` [PULL 11/30] qapi chardev: " Markus Armbruster
2022-12-14  7:47 ` [PULL 12/30] qapi crypto: " Markus Armbruster
2022-12-14  7:47 ` [PULL 13/30] qapi dump: " Markus Armbruster
2022-12-14  7:47 ` [PULL 14/30] qapi job: " Markus Armbruster
2022-12-14  7:47 ` [PULL 15/30] qapi machine: " Markus Armbruster
2022-12-14  7:47 ` [PULL 16/30] qapi migration: " Markus Armbruster
2022-12-14  7:47 ` [PULL 17/30] qapi misc: " Markus Armbruster
2022-12-14  7:47 ` [PULL 18/30] qapi net: " Markus Armbruster
2022-12-14  7:47 ` [PULL 19/30] qapi pci: " Markus Armbruster
2022-12-14  7:47 ` [PULL 20/30] qapi qdev qom: " Markus Armbruster
2022-12-14  7:47 ` [PULL 21/30] qapi replay: " Markus Armbruster
2022-12-14  7:47 ` [PULL 22/30] qapi rocker: " Markus Armbruster
2022-12-14  7:47 ` Markus Armbruster [this message]
2022-12-14  7:47 ` [PULL 24/30] qapi stats: " Markus Armbruster
2022-12-14  7:47 ` [PULL 25/30] qapi tpm: " Markus Armbruster
2022-12-14  7:47 ` [PULL 26/30] qapi transaction: " Markus Armbruster
2022-12-14  7:47 ` [PULL 27/30] qapi ui: " Markus Armbruster
2022-12-14  7:47 ` [PULL 28/30] qapi virtio: " Markus Armbruster
2022-12-14  7:47 ` [PULL 29/30] qapi qga: " Markus Armbruster
2022-12-14  7:47 ` [PULL 30/30] qapi: Drop temporary logic to support conversion step by step Markus Armbruster
2022-12-14 17:03 ` [PULL 00/30] QAPI patches patches for 2022-12-14 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221214074721.731441-26-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).