OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-io: use BdrvRequestFlags instead of int

Browse Source 
The block layer APIs use BdrvRequestFlags while qemu-io code uses int.
Although the code compiles and runs fine, BdrvRequestFlags is clearer
because it differentiates between other types of flags like bdrv_open()
flags.

This is purely refactoring.

Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20230207203719.242926-3-stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2023-02-07 15:37:17 -05:00
parent 3c5867156e
commit 1321e00801
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qemu-io-cmds.c
View File

@ -556,7 +556,7 @@ static int do_pread(BlockBackend *blk, char *buf, int64_t offset,
} }
static int do_pwrite(BlockBackend *blk, char *buf, int64_t offset, static int do_pwrite(BlockBackend *blk, char *buf, int64_t offset,
int64_t bytes, int flags, int64_t *total) int64_t bytes, BdrvRequestFlags flags, int64_t *total)
{ {
int ret; int ret;
@ -573,7 +573,8 @@ static int do_pwrite(BlockBackend *blk, char *buf, int64_t offset,
} }
static int do_pwrite_zeroes(BlockBackend *blk, int64_t offset, static int do_pwrite_zeroes(BlockBackend *blk, int64_t offset,
int64_t bytes, int flags, int64_t *total) int64_t bytes, BdrvRequestFlags flags,
int64_t *total)
{ {
int ret = blk_pwrite_zeroes(blk, offset, bytes, int ret = blk_pwrite_zeroes(blk, offset, bytes,
flags | BDRV_REQ_ZERO_WRITE); flags | BDRV_REQ_ZERO_WRITE);
@ -651,7 +652,7 @@ static int do_aio_readv(BlockBackend *blk, QEMUIOVector *qiov,
} }
static int do_aio_writev(BlockBackend *blk, QEMUIOVector *qiov, static int do_aio_writev(BlockBackend *blk, QEMUIOVector *qiov,
int64_t offset, int flags, int *total) int64_t offset, BdrvRequestFlags flags, int *total)
{ {
int async_ret = NOT_DONE; int async_ret = NOT_DONE;
@ -1028,7 +1029,7 @@ static int write_f(BlockBackend *blk, int argc, char **argv)
struct timespec t1, t2; struct timespec t1, t2;
bool Cflag = false, qflag = false, bflag = false; bool Cflag = false, qflag = false, bflag = false;
bool Pflag = false, zflag = false, cflag = false, sflag = false; bool Pflag = false, zflag = false, cflag = false, sflag = false;
int flags = 0; BdrvRequestFlags flags = 0;
int c, cnt, ret; int c, cnt, ret;
char *buf = NULL; char *buf = NULL;
int64_t offset; int64_t offset;
@ -1229,7 +1230,7 @@ static int writev_f(BlockBackend *blk, int argc, char **argv)
{ {
struct timespec t1, t2; struct timespec t1, t2;
bool Cflag = false, qflag = false; bool Cflag = false, qflag = false;
int flags = 0; BdrvRequestFlags flags = 0;
int c, cnt, ret; int c, cnt, ret;
char *buf; char *buf;
int64_t offset; int64_t offset;
@ -1544,7 +1545,7 @@ static int aio_write_f(BlockBackend *blk, int argc, char **argv)
int nr_iov, c; int nr_iov, c;
int pattern = 0xcd; int pattern = 0xcd;
struct aio_ctx *ctx = g_new0(struct aio_ctx, 1); struct aio_ctx *ctx = g_new0(struct aio_ctx, 1);
int flags = 0; BdrvRequestFlags flags = 0;
ctx->blk = blk; ctx->blk = blk;
while ((c = getopt(argc, argv, "CfiqP:uz")) != -1) { while ((c = getopt(argc, argv, "CfiqP:uz")) != -1) {