qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: odaki@rsg.ci.i.u-tokyo.ac.jp, marcandre.lureau@redhat.com,
	berrange@redhat.com, Steve Sistare <steven.sistare@oracle.com>
Subject: [PATCH v2 04/12] migration/cpr: Clean up error reporting in cpr_resave_fd()
Date: Wed, 17 Sep 2025 13:51:59 +0200	[thread overview]
Message-ID: <20250917115207.1730186-5-armbru@redhat.com> (raw)
In-Reply-To: <20250917115207.1730186-1-armbru@redhat.com>

qapi/error.h advises:

 * Please don't error_setg(&error_fatal, ...), use error_report() and
 * exit(), because that's more obvious.

Do that, and replace exit() by g_assert_not_reached(), since this is
actually a programming error.

Cc: Steve Sistare <steven.sistare@oracle.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Steve Sistare <steven.sistare@oracle.com>
---
 migration/cpr.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/migration/cpr.c b/migration/cpr.c
index 42ad0b0d50..9848a21ea6 100644
--- a/migration/cpr.c
+++ b/migration/cpr.c
@@ -7,6 +7,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/error-report.h"
 #include "hw/vfio/vfio-device.h"
 #include "migration/cpr.h"
 #include "migration/misc.h"
@@ -100,10 +101,10 @@ void cpr_resave_fd(const char *name, int id, int fd)
     if (old_fd < 0) {
         cpr_save_fd(name, id, fd);
     } else if (old_fd != fd) {
-        error_setg(&error_fatal,
-                   "internal error: cpr fd '%s' id %d value %d "
-                   "already saved with a different value %d",
-                   name, id, fd, old_fd);
+        error_report("internal error: cpr fd '%s' id %d value %d "
+                     "already saved with a different value %d",
+                     name, id, fd, old_fd);
+        g_assert_not_reached();
     }
 }
 
-- 
2.49.0



  parent reply	other threads:[~2025-09-17 11:55 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-17 11:51 [PATCH v2 00/12] Error reporting cleanup, a fix, and &error_warn removal Markus Armbruster
2025-09-17 11:51 ` [PATCH v2 01/12] monitor: Clean up HMP gdbserver error reporting Markus Armbruster
2025-09-17 11:51 ` [PATCH v2 02/12] tcg: Fix error reporting on mprotect() failure in tcg_region_init() Markus Armbruster
2025-09-17 16:23   ` Richard Henderson
2025-09-18 12:23   ` Akihiko Odaki
2025-09-18 14:22     ` Markus Armbruster
2025-09-17 11:51 ` [PATCH v2 03/12] hw/cxl: Convert cxl_fmws_link() to Error Markus Armbruster
2025-09-17 13:15   ` Jonathan Cameron via
2025-09-17 11:51 ` Markus Armbruster [this message]
2025-09-17 11:52 ` [PATCH v2 05/12] hw/remote/vfio-user: Clean up error reporting Markus Armbruster
2025-09-17 11:52 ` [PATCH v2 06/12] net/slirp: " Markus Armbruster
2025-09-18 12:24   ` Akihiko Odaki
2025-09-18 14:24     ` Markus Armbruster
2025-09-17 11:52 ` [PATCH v2 07/12] ui/spice-core: " Markus Armbruster
2025-09-17 20:34   ` Richard Henderson
2025-09-17 11:52 ` [PATCH v2 08/12] util/oslib-win32: Do not treat null @errp as &error_warn Markus Armbruster
2025-09-17 20:33   ` Richard Henderson
2025-09-17 11:52 ` [PATCH v2 09/12] ui/pixman: Consistent error handling in qemu_pixman_shareable_free() Markus Armbruster
2025-09-17 11:52 ` [PATCH v2 10/12] ui/dbus: Clean up dbus_update_gl_cb() error checking Markus Armbruster
2025-09-17 11:52 ` [PATCH v2 11/12] ui/dbus: Consistent handling of texture mutex failure Markus Armbruster
2025-09-17 11:52 ` [PATCH v2 12/12] error: Kill @error_warn Markus Armbruster
2025-09-17 15:18   ` Vladimir Sementsov-Ogievskiy

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=20250917115207.1730186-5-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=odaki@rsg.ci.i.u-tokyo.ac.jp \
    --cc=qemu-devel@nongnu.org \
    --cc=steven.sistare@oracle.com \
    /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).