[v5] error: auto propagated local_err

[RFC v5 011/126] block/snapshot: rename Error ** parameter to more common errp

Posted by Vladimir Sementsov-Ogievskiy 6 years, 3 months ago

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 block/snapshot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/snapshot.c b/block/snapshot.c
index 8081616ae9..bd9fb01817 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -426,7 +426,7 @@ fail:
 }
 
 int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bad_bs,
-                             Error **err)
+                             Error **errp)
 {
     int ret = 0;
     BlockDriverState *bs;
@@ -441,7 +441,7 @@ int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bad_bs,
             bdrv_snapshot_find(bs, snapshot, name) >= 0)
         {
             ret = bdrv_snapshot_delete(bs, snapshot->id_str,
-                                       snapshot->name, err);
+                                       snapshot->name, errp);
         }
         aio_context_release(ctx);
         if (ret < 0) {
-- 
2.21.0

Re: [RFC v5 011/126] block/snapshot: rename Error ** parameter to more common errp

Posted by Eric Blake 6 years, 3 months ago

On 10/11/19 11:03 AM, Vladimir Sementsov-Ogievskiy wrote:
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
>   block/snapshot.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 

Reviewed-by: Eric Blake <eblake@redhat.com>

> diff --git a/block/snapshot.c b/block/snapshot.c
> index 8081616ae9..bd9fb01817 100644
> --- a/block/snapshot.c
> +++ b/block/snapshot.c
> @@ -426,7 +426,7 @@ fail:
>   }
>   
>   int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bad_bs,
> -                             Error **err)
> +                             Error **errp)
>   {
>       int ret = 0;
>       BlockDriverState *bs;
> @@ -441,7 +441,7 @@ int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bad_bs,
>               bdrv_snapshot_find(bs, snapshot, name) >= 0)
>           {
>               ret = bdrv_snapshot_delete(bs, snapshot->id_str,
> -                                       snapshot->name, err);
> +                                       snapshot->name, errp);
>           }
>           aio_context_release(ctx);
>           if (ret < 0) {
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org