diff options
| author | Alberto Faria | 2022-07-05 18:15:10 +0200 |
|---|---|---|
| committer | Hanna Reitz | 2022-07-12 12:14:56 +0200 |
| commit | 3b35d4542c8537a9269f6372df531ced6c960084 (patch) | |
| tree | 0a59e4957fa7193db852233956f77515e37a2c41 /nbd | |
| parent | block: Make blk_{pread,pwrite}() return 0 on success (diff) | |
| download | qemu-3b35d4542c8537a9269f6372df531ced6c960084.tar.gz qemu-3b35d4542c8537a9269f6372df531ced6c960084.tar.xz qemu-3b35d4542c8537a9269f6372df531ced6c960084.zip | |
block: Add a 'flags' param to blk_pread()
For consistency with other I/O functions, and in preparation to
implement it using generated_co_wrapper.
Callers were updated using this Coccinelle script:
@@ expression blk, offset, buf, bytes; @@
- blk_pread(blk, offset, buf, bytes)
+ blk_pread(blk, offset, buf, bytes, 0)
It had no effect on hw/block/nand.c, presumably due to the #if, so that
file was updated manually.
Overly-long lines were then fixed by hand.
Signed-off-by: Alberto Faria <afaria@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220705161527.1054072-3-afaria@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Diffstat (limited to 'nbd')
| -rw-r--r-- | nbd/server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nbd/server.c b/nbd/server.c index 213e00e761..849433aa3a 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -2040,7 +2040,7 @@ static int coroutine_fn nbd_co_send_sparse_read(NBDClient *client, ret = nbd_co_send_iov(client, iov, 1, errp); } else { ret = blk_pread(exp->common.blk, offset + progress, - data + progress, pnum); + data + progress, pnum, 0); if (ret < 0) { error_setg_errno(errp, -ret, "reading from file failed"); break; @@ -2444,7 +2444,7 @@ static coroutine_fn int nbd_do_cmd_read(NBDClient *client, NBDRequest *request, data, request->len, errp); } - ret = blk_pread(exp->common.blk, request->from, data, request->len); + ret = blk_pread(exp->common.blk, request->from, data, request->len, 0); if (ret < 0) { return nbd_send_generic_reply(client, request->handle, ret, "reading from file failed", errp); |