block/snapshot: rename Error ** parameter to more common errp
PATCH v6 1/1 block/snapshot: rename Error ** parameter to more common errp
---
v6: merge corresponding header change here, so, v6 is merge of
[RFC v5 011/126] block/snapshot: rename Error ** parameter to more common errp and
[RFC v5 019/126] include/block/snapshot.h: rename Error ** parameter to more common errp both has Eric's r-b, so I keep Eric's r-b for the merge
include/block/snapshot.h | 2 +- block/snapshot.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
include/block/snapshot.h +1 -1
@@ -78,7 +78,7 @@ int bdrv_snapshot_load_tmp_by_id_or_name(BlockDriverState *bs,bool bdrv_all_can_snapshot (BlockDriverState **first_bad_bs);int bdrv_all_delete_snapshot (const char *name,BlockDriverState **first_bsd_bs, -Error **err); +Error **errp);int bdrv_all_goto_snapshot (const char *name,BlockDriverState **first_bad_bs,Error **errp);int bdrv_all_find_snapshot (const char *name,BlockDriverState **first_bad_bs);
block/snapshot.c +2 -2
@@ -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 ) {
Signature · 1 line
2.21.0
Max Reitz
AppliedQuoted 10 lines · Vladimir Sementsov-Ogievskiy
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>Reviewed-by Eric Blake <[email protected]>---
v6: merge corresponding header change here, so, v6 is merge of
[RFC v5 011/126] block/snapshot: rename Error ** parameter to more common errp and
[RFC v5 019/126]include/block/snapshot.h: rename Error ** parameter to more common errp both has Eric's r-b, so I keep Eric's r-b for the merge
Quoted 3 lines
include/block/snapshot.h | 2 +- block/snapshot.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
Thanks, applied to my block-next branch:
https://git.xanclic.moe/XanClic/qemu/commits/branch/block-next
Max