aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2024-08-29 20:55:27 +0200
committerKevin Wolf <kwolf@redhat.com>2024-10-22 17:52:49 +0200
commit04bbc3ee52b32ac465547bb40c1f090a1b8f315a (patch)
tree181783fe136ad87ceb3d298ac9e830e0a4eaa099 /block
parent2155d2dd7f733674586119b6b4ee0f52d2032779 (diff)
downloadqemu-04bbc3ee52b32ac465547bb40c1f090a1b8f315a.zip
qemu-04bbc3ee52b32ac465547bb40c1f090a1b8f315a.tar.gz
qemu-04bbc3ee52b32ac465547bb40c1f090a1b8f315a.tar.bz2
raw-format: Fix error message for invalid offset/size
s->offset and s->size are only set at the end of the function and still contain the old values when formatting the error message. Print the parameters with the new values that we actually checked instead. Fixes: 500e2434207d ('raw-format: Split raw_read_options()') Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-ID: <20240829185527.47152-1-kwolf@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Hanna Czenczek <hreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/raw-format.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/raw-format.c b/block/raw-format.c
index ac7e849..e08526e 100644
--- a/block/raw-format.c
+++ b/block/raw-format.c
@@ -111,7 +111,7 @@ raw_apply_options(BlockDriverState *bs, BDRVRawState *s, uint64_t offset,
if (offset > real_size) {
error_setg(errp, "Offset (%" PRIu64 ") cannot be greater than "
"size of the containing file (%" PRId64 ")",
- s->offset, real_size);
+ offset, real_size);
return -EINVAL;
}
@@ -119,7 +119,7 @@ raw_apply_options(BlockDriverState *bs, BDRVRawState *s, uint64_t offset,
error_setg(errp, "The sum of offset (%" PRIu64 ") and size "
"(%" PRIu64 ") has to be smaller or equal to the "
" actual size of the containing file (%" PRId64 ")",
- s->offset, s->size, real_size);
+ offset, size, real_size);
return -EINVAL;
}