haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-io: Account IO by aio_read and aio_write 

This will enable accounting of aio requests issued from qemu-io aio
read/write commands.

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1422586186-9925-2-git-send-email-famz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
stable-2.3
Fam Zheng 2015-01-30 10:49:42 +08:00 committed by Stefan Hajnoczi
parent efef88b3d9
commit a91f958456
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qemu-io-cmds.c
View File

@ -13,6 +13,7 @@
#include "block/qapi.h"
#include "qemu/main-loop.h"
#include "qemu/timer.h"
#include "sysemu/block-backend.h"
#define CMD_NOFILE_OK 0x01
@ -1337,6 +1338,7 @@ out:
}
struct aio_ctx {
BlockDriverState *bs;
QEMUIOVector qiov;
int64_t offset;
char *buf;
@ -1344,6 +1346,7 @@ struct aio_ctx {
int vflag;
int Cflag;
int Pflag;
BlockAcctCookie acct;
int pattern;
struct timeval t1;
};
@ -1361,6 +1364,8 @@ static void aio_write_done(void *opaque, int ret)
goto out;
}
block_acct_done(&ctx->bs->stats, &ctx->acct);
if (ctx->qflag) {
goto out;
}
@ -1398,6 +1403,8 @@ static void aio_read_done(void *opaque, int ret)
g_free(cmp_buf);
}
block_acct_done(&ctx->bs->stats, &ctx->acct);
if (ctx->qflag) {
goto out;
}
@ -1453,6 +1460,7 @@ static int aio_read_f(BlockDriverState *bs, int argc, char **argv)
int nr_iov, c;
struct aio_ctx *ctx = g_new0(struct aio_ctx, 1);
ctx->bs = bs;
while ((c = getopt(argc, argv, "CP:qv")) != EOF) {
switch (c) {
case 'C':
@ -1506,6 +1514,7 @@ static int aio_read_f(BlockDriverState *bs, int argc, char **argv)
}
gettimeofday(&ctx->t1, NULL);
block_acct_start(&bs->stats, &ctx->acct, ctx->qiov.size, BLOCK_ACCT_READ);
bdrv_aio_readv(bs, ctx->offset >> 9, &ctx->qiov,
ctx->qiov.size >> 9, aio_read_done, ctx);
return 0;
@ -1549,6 +1558,7 @@ static int aio_write_f(BlockDriverState *bs, int argc, char **argv)
int pattern = 0xcd;
struct aio_ctx *ctx = g_new0(struct aio_ctx, 1);
ctx->bs = bs;
while ((c = getopt(argc, argv, "CqP:")) != EOF) {
switch (c) {
case 'C':
@ -1598,6 +1608,7 @@ static int aio_write_f(BlockDriverState *bs, int argc, char **argv)
}
gettimeofday(&ctx->t1, NULL);
block_acct_start(&bs->stats, &ctx->acct, ctx->qiov.size, BLOCK_ACCT_WRITE);
bdrv_aio_writev(bs, ctx->offset >> 9, &ctx->qiov,
ctx->qiov.size >> 9, aio_write_done, ctx);
return 0;