summaryrefslogtreecommitdiff
path: root/block/iscsi.c
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2017-03-28 22:51:28 +0200
committerMax Reitz <mreitz@redhat.com>2017-04-28 16:02:03 +0200
commit4bff28b81a0ddb48a09d279e99ab847e8a292506 (patch)
tree5d792e847143ace016de670db3106a3d9466c10a /block/iscsi.c
parented3d2ec98a33fbdeabc471b11ff807075f07e996 (diff)
downloadqemu-4bff28b81a0ddb48a09d279e99ab847e8a292506.tar.gz
block: Add errp to BD.bdrv_truncate()
Add an Error parameter to the block drivers' bdrv_truncate() interface. If a block driver does not set this in case of an error, the generic bdrv_truncate() implementation will do so. Where it is obvious, this patch also makes some block drivers set this value. Signed-off-by: Max Reitz <mreitz@redhat.com> Message-id: 20170328205129.15138-4-mreitz@redhat.com Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block/iscsi.c')
-rw-r--r--block/iscsi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/iscsi.c b/block/iscsi.c
index 42fb0b019c..1ef38cf3d0 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -2059,7 +2059,7 @@ static void iscsi_reopen_commit(BDRVReopenState *reopen_state)
}
}
-static int iscsi_truncate(BlockDriverState *bs, int64_t offset)
+static int iscsi_truncate(BlockDriverState *bs, int64_t offset, Error **errp)
{
IscsiLun *iscsilun = bs->opaque;
Error *local_err = NULL;
@@ -2070,7 +2070,7 @@ static int iscsi_truncate(BlockDriverState *bs, int64_t offset)
iscsi_readcapacity_sync(iscsilun, &local_err);
if (local_err != NULL) {
- error_free(local_err);
+ error_propagate(errp, local_err);
return -EIO;
}