[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 50/53] fw_cfg: Use ERRP_GUARD()
From: |
Markus Armbruster |
Subject: |
[PULL 50/53] fw_cfg: Use ERRP_GUARD() |
Date: |
Tue, 7 Jul 2020 23:25:00 +0200 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
If we want to check error after errp-function call, we need to
introduce local_err and then propagate it to errp. Instead, use
the ERRP_GUARD() macro, benefits are:
1. No need of explicit error_propagate call
2. No need of explicit local_err variable: use errp directly
3. ERRP_GUARD() leaves errp as is if it's not NULL or
&error_fatal, this means that we don't break error_abort
(we'll abort on error_set, not on error_propagate)
If we want to add some info to errp (by error_prepend() or
error_append_hint()), we must use the ERRP_GUARD() macro.
Otherwise, this info will not be added when errp == &error_fatal
(the program will exit prior to the error_append_hint() or
error_prepend() call). No such cases are being fixed here.
This commit is generated by command
sed -n '/^Firmware configuration (fw_cfg)$/,/^$/{s/^F: //p}' \
MAINTAINERS | \
xargs git ls-files | grep '\.[hc]$' | \
xargs spatch \
--sp-file scripts/coccinelle/errp-guard.cocci \
--macro-file scripts/cocci-macro-file.h \
--in-place --no-show-diff --max-width 80
Reported-by: Kevin Wolf <kwolf@redhat.com>
Reported-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[Commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200707165037.1026246-6-armbru@redhat.com>
[ERRP_AUTO_PROPAGATE() renamed to ERRP_GUARD(), and
auto-propagated-errp.cocci to errp-guard.cocci. Commit message
tweaked again.]
---
hw/nvram/fw_cfg.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 0408a31f8e..61b00d765a 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -1231,12 +1231,11 @@ static Property fw_cfg_io_properties[] = {
static void fw_cfg_io_realize(DeviceState *dev, Error **errp)
{
+ ERRP_GUARD();
FWCfgIoState *s = FW_CFG_IO(dev);
- Error *local_err = NULL;
- fw_cfg_file_slots_allocate(FW_CFG(s), &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
+ fw_cfg_file_slots_allocate(FW_CFG(s), errp);
+ if (*errp) {
return;
}
@@ -1282,14 +1281,13 @@ static Property fw_cfg_mem_properties[] = {
static void fw_cfg_mem_realize(DeviceState *dev, Error **errp)
{
+ ERRP_GUARD();
FWCfgMemState *s = FW_CFG_MEM(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
const MemoryRegionOps *data_ops = &fw_cfg_data_mem_ops;
- Error *local_err = NULL;
- fw_cfg_file_slots_allocate(FW_CFG(s), &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
+ fw_cfg_file_slots_allocate(FW_CFG(s), errp);
+ if (*errp) {
return;
}
--
2.26.2
- [PULL 00/53] Error reporting patches patches for 2020-07-07, Markus Armbruster, 2020/07/08
- [PULL 50/53] fw_cfg: Use ERRP_GUARD(),
Markus Armbruster <=
- [PULL 02/53] error: Improve error.h's big comment, Markus Armbruster, 2020/07/08
- [PULL 38/53] block/parallels: Simplify parallels_open() after previous commit, Markus Armbruster, 2020/07/08
- [PULL 08/53] qemu-option: Make uses of find_desc_by_name() more similar, Markus Armbruster, 2020/07/08
- [PULL 04/53] qdev: Use returned bool to check for qdev_realize() etc. failure, Markus Armbruster, 2020/07/08
- [PULL 07/53] qemu-option: Check return value instead of @err where convenient, Markus Armbruster, 2020/07/08
- [PULL 32/53] qdev: Use returned bool to check for failure, Coccinelle part, Markus Armbruster, 2020/07/08
- [PULL 06/53] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize(), Markus Armbruster, 2020/07/08
- [PULL 44/53] qdev: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/07/08
- [PULL 52/53] nbd: Use ERRP_GUARD(), Markus Armbruster, 2020/07/08
- [PULL 27/53] qom: Make functions taking Error ** return bool, not void, Markus Armbruster, 2020/07/08