OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pflash: Use ERRP_GUARD()

Browse Source 
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 '/^Parallel NOR Flash devices$/,/^$/{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-5-armbru@redhat.com>
[ERRP_AUTO_PROPAGATE() renamed to ERRP_GUARD(), and
auto-propagated-errp.cocci to errp-guard.cocci.  Commit message
tweaked again.]
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2020-07-07 18:50:33 +02:00 committed by Markus Armbruster
parent de1b3800b7
commit 76612456aa
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/block/pflash_cfi01.c
View File

@ -696,12 +696,12 @@ static const MemoryRegionOps pflash_cfi01_ops = {
static void pflash_cfi01_realize(DeviceState *dev, Error **errp) static void pflash_cfi01_realize(DeviceState *dev, Error **errp)
{ {
ERRP_GUARD();
PFlashCFI01 *pfl = PFLASH_CFI01(dev); PFlashCFI01 *pfl = PFLASH_CFI01(dev);
uint64_t total_len; uint64_t total_len;
int ret; int ret;
uint64_t blocks_per_device, sector_len_per_device, device_len; uint64_t blocks_per_device, sector_len_per_device, device_len;
int num_devices; int num_devices;
Error *local_err = NULL;
if (pfl->sector_len == 0) { if (pfl->sector_len == 0) {
error_setg(errp, "attribute \"sector-length\" not specified or zero."); error_setg(errp, "attribute \"sector-length\" not specified or zero.");
@ -735,9 +735,8 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp)
&pfl->mem, OBJECT(dev), &pfl->mem, OBJECT(dev),
&pflash_cfi01_ops, &pflash_cfi01_ops,
pfl, pfl,
pfl->name, total_len, &local_err); pfl->name, total_len, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }

7
hw/block/pflash_cfi02.c
View File

@ -724,9 +724,9 @@ static const MemoryRegionOps pflash_cfi02_ops = {
static void pflash_cfi02_realize(DeviceState *dev, Error **errp) static void pflash_cfi02_realize(DeviceState *dev, Error **errp)
{ {
ERRP_GUARD();
PFlashCFI02 *pfl = PFLASH_CFI02(dev); PFlashCFI02 *pfl = PFLASH_CFI02(dev);
int ret; int ret;
Error *local_err = NULL;
if (pfl->uniform_sector_len == 0 && pfl->sector_len[0] == 0) { if (pfl->uniform_sector_len == 0 && pfl->sector_len[0] == 0) {
error_setg(errp, "attribute \"sector-length\" not specified or zero."); error_setg(errp, "attribute \"sector-length\" not specified or zero.");
@ -792,9 +792,8 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp)
memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl),
&pflash_cfi02_ops, pfl, pfl->name, &pflash_cfi02_ops, pfl, pfl->name,
pfl->chip_len, &local_err); pfl->chip_len, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }