diff options
| author | Stefan Hajnoczi | 2022-10-13 20:58:59 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2022-10-26 20:56:42 +0200 |
| commit | 4f384011c5a37f80dc6cadefffac61ffb1c3aa1e (patch) | |
| tree | d720ec42488e83afa07d95c45ee33c3f0a15d6fa /qemu-img.c | |
| parent | numa: call ->ram_block_removed() in ram_block_notifer_remove() (diff) | |
| download | qemu-4f384011c5a37f80dc6cadefffac61ffb1c3aa1e.tar.gz qemu-4f384011c5a37f80dc6cadefffac61ffb1c3aa1e.tar.xz qemu-4f384011c5a37f80dc6cadefffac61ffb1c3aa1e.zip | |
block: pass size to bdrv_unregister_buf()
The only implementor of bdrv_register_buf() is block/nvme.c, where the
size is not needed when unregistering a buffer. This is because
util/vfio-helpers.c can look up mappings by address.
Future block drivers that implement bdrv_register_buf() may not be able
to do their job given only the buffer address. Add a size argument to
bdrv_unregister_buf().
Also document the assumptions about
bdrv_register_buf()/bdrv_unregister_buf() calls. The same <host, size>
values that were given to bdrv_register_buf() must be given to
bdrv_unregister_buf().
gcc 11.2.1 emits a spurious warning that img_bench()'s buf_size local
variable might be uninitialized, so it's necessary to silence the
compiler.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Message-id: 20221013185908.1297568-5-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-img.c b/qemu-img.c index ace3adf8ae..9fe94df650 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -4371,7 +4371,7 @@ static int img_bench(int argc, char **argv) struct timeval t1, t2; int i; bool force_share = false; - size_t buf_size; + size_t buf_size = 0; for (;;) { static const struct option long_options[] = { @@ -4593,7 +4593,7 @@ static int img_bench(int argc, char **argv) out: if (data.buf) { - blk_unregister_buf(blk, data.buf); + blk_unregister_buf(blk, data.buf, buf_size); } qemu_vfree(data.buf); blk_unref(blk); |