From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Zhao Liu <zhao1.liu@intel.com>, Peter Xu <peterx@redhat.com>,
Fabiano Rosas <farosas@suse.de>
Subject: [PULL 30/55] migration/option: Fix missing ERRP_GUARD() for error_prepend()
Date: Tue, 12 Mar 2024 13:43:14 +0100 [thread overview]
Message-ID: <20240312124339.761630-31-thuth@redhat.com> (raw)
In-Reply-To: <20240312124339.761630-1-thuth@redhat.com>
From: Zhao Liu <zhao1.liu@intel.com>
As the comment in qapi/error, passing @errp to error_prepend() requires
ERRP_GUARD():
* = Why, when and how to use ERRP_GUARD() =
*
* Without ERRP_GUARD(), use of the @errp parameter is restricted:
...
* - It should not be passed to error_prepend(), error_vprepend() or
* error_append_hint(), because that doesn't work with &error_fatal.
* ERRP_GUARD() lifts these restrictions.
*
* To use ERRP_GUARD(), add it right at the beginning of the function.
* @errp can then be used without worrying about the argument being
* NULL or &error_fatal.
ERRP_GUARD() could avoid the case when @errp is &error_fatal, the user
can't see this additional information, because exit() happens in
error_setg earlier than information is added [1].
The migrate_params_check() passes @errp to error_prepend() without
ERRP_GUARD(), and it could be called from migration_object_init(),
where the passed @errp points to @error_fatal.
Therefore, the error message echoed in error_prepend() will be lost
because of the above issue.
To fix this, add missing ERRP_GUARD() at the beginning of this function.
[1]: Issue description in the commit message of commit ae7c80a7bd73
("error: New macro ERRP_GUARD()").
Cc: Peter Xu <peterx@redhat.com>
Cc: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Acked-by: Peter Xu <peterx@redhat.com>
Message-ID: <20240311033822.3142585-28-zhao1.liu@linux.intel.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
migration/options.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/migration/options.c b/migration/options.c
index 40eb930940..caff0a271d 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -1085,6 +1085,8 @@ void migrate_params_init(MigrationParameters *params)
*/
bool migrate_params_check(MigrationParameters *params, Error **errp)
{
+ ERRP_GUARD();
+
if (params->has_compress_level &&
(params->compress_level > 9)) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "compress_level",
--
2.44.0
next prev parent reply other threads:[~2024-03-12 12:59 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-12 12:42 [PULL 00/55] Misc ERRP_GUARD() and cpu_env() patches Thomas Huth
2024-03-12 12:42 ` [PULL 01/55] hw/cxl/cxl-host: Fix missing ERRP_GUARD() in cxl_fixed_memory_window_config() Thomas Huth
2024-03-12 12:42 ` [PULL 02/55] hw/display/macfb: Fix missing ERRP_GUARD() in macfb_nubus_realize() Thomas Huth
2024-03-12 12:42 ` [PULL 03/55] hw/mem/cxl_type3: Fix missing ERRP_GUARD() in ct3_realize() Thomas Huth
2024-03-12 12:42 ` [PULL 04/55] hw/misc/xlnx-versal-trng: Check returned bool in trng_prop_fault_event_set() Thomas Huth
2024-03-12 12:42 ` [PULL 05/55] hw/pci-bridge/cxl_upstream: Fix missing ERRP_GUARD() in cxl_usp_realize() Thomas Huth
2024-03-12 12:42 ` [PULL 06/55] hw/intc: Check @errp to handle the error of IOAPICCommonClass.realize() Thomas Huth
2024-03-12 12:42 ` [PULL 07/55] error: Add error_vprepend() in comment of ERRP_GUARD() rules Thomas Huth
2024-03-12 12:42 ` [PULL 08/55] backends/iommufd: Fix missing ERRP_GUARD() for error_prepend() Thomas Huth
2024-03-12 12:42 ` [PULL 09/55] block: " Thomas Huth
2024-03-12 12:42 ` [PULL 10/55] block/copy-before-write: " Thomas Huth
2024-03-12 12:42 ` [PULL 11/55] block/nbd: " Thomas Huth
2024-03-12 12:42 ` [PULL 12/55] block/nvme: " Thomas Huth
2024-03-12 12:42 ` [PULL 13/55] block/qcow2-bitmap: " Thomas Huth
2024-03-12 12:42 ` [PULL 14/55] block/qcow2: " Thomas Huth
2024-03-12 12:42 ` [PULL 15/55] block/qed: " Thomas Huth
2024-03-12 12:43 ` [PULL 16/55] block/snapshot: " Thomas Huth
2024-03-12 12:43 ` [PULL 17/55] block/vdi: " Thomas Huth
2024-03-12 12:43 ` [PULL 18/55] block/vmdk: " Thomas Huth
2024-03-12 12:43 ` [PULL 19/55] block/virtio-blk: " Thomas Huth
2024-03-12 12:43 ` [PULL 20/55] hw/scsi/vhost-scsi: " Thomas Huth
2024-03-12 12:43 ` [PULL 21/55] hw/vfio/ap: " Thomas Huth
2024-03-12 12:43 ` [PULL 22/55] hw/vfio/container: " Thomas Huth
2024-03-12 12:43 ` [PULL 23/55] hw/vfio/helpers: " Thomas Huth
2024-03-12 12:43 ` [PULL 24/55] hw/vfio/iommufd: " Thomas Huth
2024-03-12 12:43 ` [PULL 25/55] hw/vfio/pci-quirks: " Thomas Huth
2024-03-12 12:43 ` [PULL 26/55] hw/vfio/pci: " Thomas Huth
2024-03-12 12:43 ` [PULL 27/55] hw/vfio/platform: " Thomas Huth
2024-03-12 12:43 ` [PULL 28/55] hw/virtio/vhost-vsock: " Thomas Huth
2024-03-12 12:43 ` [PULL 29/55] hw/virtio/vhost: " Thomas Huth
2024-03-12 12:43 ` Thomas Huth [this message]
2024-03-12 12:43 ` [PULL 31/55] net/vhost-vdpa: " Thomas Huth
2024-03-12 12:43 ` [PULL 32/55] target/s390x/cpu_models: " Thomas Huth
2024-03-12 12:43 ` [PULL 33/55] error: Move ERRP_GUARD() to the beginning of the function Thomas Huth
2024-03-12 12:43 ` [PULL 34/55] bulk: Access existing variables initialized to &S->F when available Thomas Huth
2024-03-12 12:43 ` [PULL 35/55] hw/core: Declare CPUArchId::cpu as CPUState instead of Object Thomas Huth
2024-03-12 12:43 ` [PULL 36/55] bulk: Call in place single use cpu_env() Thomas Huth
2024-03-12 12:43 ` [PULL 37/55] target: Replace CPU_GET_CLASS(cpu -> obj) in cpu_reset_hold() handler Thomas Huth
2024-03-12 12:43 ` [PULL 38/55] target/alpha: Prefer fast cpu_env() over slower CPU QOM cast macro Thomas Huth
2024-03-12 12:43 ` [PULL 39/55] target/avr: " Thomas Huth
2024-03-12 12:43 ` [PULL 40/55] target/cris: " Thomas Huth
2024-03-12 12:43 ` [PULL 41/55] target/hexagon: " Thomas Huth
2024-03-12 12:43 ` [PULL 42/55] target/i386/hvf: Use CPUState typedef Thomas Huth
2024-03-12 12:43 ` [PULL 43/55] target/loongarch: Prefer fast cpu_env() over slower CPU QOM cast macro Thomas Huth
2024-03-12 12:43 ` [PULL 44/55] target/m68k: " Thomas Huth
2024-03-12 12:43 ` [PULL 45/55] target/microblaze: " Thomas Huth
2024-03-12 12:43 ` [PULL 46/55] target/mips: " Thomas Huth
2024-03-12 12:43 ` [PULL 47/55] target/nios2: " Thomas Huth
2024-03-12 12:43 ` [PULL 48/55] target/openrisc: " Thomas Huth
2024-03-12 12:43 ` [PULL 49/55] target/ppc: " Thomas Huth
2024-03-12 12:43 ` [PULL 50/55] target/rx: " Thomas Huth
2024-03-12 12:43 ` [PULL 51/55] target/sh4: " Thomas Huth
2024-03-12 12:43 ` [PULL 52/55] target/sparc: " Thomas Huth
2024-03-12 12:43 ` [PULL 53/55] target/tricore: " Thomas Huth
2024-03-12 12:43 ` [PULL 54/55] target/xtensa: " Thomas Huth
2024-03-12 12:43 ` [PULL 55/55] user: " Thomas Huth
2024-03-12 21:31 ` [PULL 00/55] Misc ERRP_GUARD() and cpu_env() patches 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=20240312124339.761630-31-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=farosas@suse.de \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=zhao1.liu@intel.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).