Commit 28298fd3 authored by Benoît Canet's avatar Benoît Canet Committed by Kevin Wolf
Browse files

block: rename BlockAcctType members to start with BLOCK_ instead of BDRV_ 



The middle term goal is to move the BlockAcctStats structure in the device models.
(Capturing I/O accounting statistics in the device models is good for billing)
This patch make a small step in this direction by removing a reference to BDRV.

CC: Kevin Wolf <kwolf@redhat.com>
CC: Stefan Hajnoczi <stefanha@redhat.com>
CC: Keith Busch <keith.busch@intel.com>
CC: Anthony Liguori <aliguori@amazon.com>
CC: "Michael S. Tsirkin" <mst@redhat.com>
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: John Snow <jsnow@redhat.com>
CC: Richard Henderson <rth@twiddle.net>
CC: Markus Armbruster <armbru@redhat.com>
CC: Alexander Graf <agraf@suse.de>i

Signed-off-by: default avatarBenoît Canet <benoit.canet@nodalink.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 5e5a94b6

block/accounting.c

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ void 
bdrv_acct_start(BlockDriverState *bs, BlockAcctCookie *cookie, int64_t bytes,

        enum BlockAcctType type)

{

    assert(type < BDRV_MAX_IOTYPE);

    assert(type < BLOCK_MAX_IOTYPE);



    cookie->bytes = bytes;

    cookie->start_time_ns = get_clock();
@@ -39,7 +39,7 @@ bdrv_acct_start(BlockDriverState *bs, BlockAcctCookie *cookie, int64_t bytes, 
void

bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie)

{

    assert(cookie->type < BDRV_MAX_IOTYPE);

    assert(cookie->type < BLOCK_MAX_IOTYPE);



    bs->stats.nr_bytes[cookie->type] += cookie->bytes;

    bs->stats.nr_ops[cookie->type]++;

block/qapi.c

+8 −8
Original line number Diff line number Diff line
@@ -333,16 +333,16 @@ static BlockStats *bdrv_query_stats(const BlockDriverState *bs) 
    }



    s->stats = g_malloc0(sizeof(*s->stats));

    s->stats->rd_bytes = bs->stats.nr_bytes[BDRV_ACCT_READ];

    s->stats->wr_bytes = bs->stats.nr_bytes[BDRV_ACCT_WRITE];

    s->stats->rd_operations = bs->stats.nr_ops[BDRV_ACCT_READ];

    s->stats->wr_operations = bs->stats.nr_ops[BDRV_ACCT_WRITE];

    s->stats->rd_bytes = bs->stats.nr_bytes[BLOCK_ACCT_READ];

    s->stats->wr_bytes = bs->stats.nr_bytes[BLOCK_ACCT_WRITE];

    s->stats->rd_operations = bs->stats.nr_ops[BLOCK_ACCT_READ];

    s->stats->wr_operations = bs->stats.nr_ops[BLOCK_ACCT_WRITE];

    s->stats->wr_highest_offset =

        bs->stats.wr_highest_sector * BDRV_SECTOR_SIZE;

    s->stats->flush_operations = bs->stats.nr_ops[BDRV_ACCT_FLUSH];

    s->stats->wr_total_time_ns = bs->stats.total_time_ns[BDRV_ACCT_WRITE];

    s->stats->rd_total_time_ns = bs->stats.total_time_ns[BDRV_ACCT_READ];

    s->stats->flush_total_time_ns = bs->stats.total_time_ns[BDRV_ACCT_FLUSH];

    s->stats->flush_operations = bs->stats.nr_ops[BLOCK_ACCT_FLUSH];

    s->stats->wr_total_time_ns = bs->stats.total_time_ns[BLOCK_ACCT_WRITE];

    s->stats->rd_total_time_ns = bs->stats.total_time_ns[BLOCK_ACCT_READ];

    s->stats->flush_total_time_ns = bs->stats.total_time_ns[BLOCK_ACCT_FLUSH];



    if (bs->file) {

        s->has_parent = true;

hw/block/nvme.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, 
    assert((nlb << data_shift) == req->qsg.size);



    dma_acct_start(n->conf.bs, &req->acct, &req->qsg, is_write ?

        BDRV_ACCT_WRITE : BDRV_ACCT_READ);

        BLOCK_ACCT_WRITE : BLOCK_ACCT_READ);

    req->aiocb = is_write ?

        dma_bdrv_write(n->conf.bs, &req->qsg, aio_slba, nvme_rw_cb, req) :

        dma_bdrv_read(n->conf.bs, &req->qsg, aio_slba, nvme_rw_cb, req);

hw/block/virtio-blk.c

+3 −3
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ void virtio_submit_multiwrite(BlockDriverState *bs, MultiReqBuffer *mrb) 


static void virtio_blk_handle_flush(VirtIOBlockReq *req, MultiReqBuffer *mrb)

{

    bdrv_acct_start(req->dev->bs, &req->acct, 0, BDRV_ACCT_FLUSH);

    bdrv_acct_start(req->dev->bs, &req->acct, 0, BLOCK_ACCT_FLUSH);



    /*

     * Make sure all outstanding writes are posted to the backing device.
@@ -322,7 +322,7 @@ static void virtio_blk_handle_write(VirtIOBlockReq *req, MultiReqBuffer *mrb) 
        return;

    }



    bdrv_acct_start(req->dev->bs, &req->acct, req->qiov.size, BDRV_ACCT_WRITE);

    bdrv_acct_start(req->dev->bs, &req->acct, req->qiov.size, BLOCK_ACCT_WRITE);



    if (mrb->num_writes == 32) {

        virtio_submit_multiwrite(req->dev->bs, mrb);
@@ -353,7 +353,7 @@ static void virtio_blk_handle_read(VirtIOBlockReq *req) 
        return;

    }



    bdrv_acct_start(req->dev->bs, &req->acct, req->qiov.size, BDRV_ACCT_READ);

    bdrv_acct_start(req->dev->bs, &req->acct, req->qiov.size, BLOCK_ACCT_READ);

    bdrv_aio_readv(req->dev->bs, sector, &req->qiov,

                   req->qiov.size / BDRV_SECTOR_SIZE,

                   virtio_blk_rw_complete, req);

hw/block/xen_disk.c

+4 −2
Original line number Diff line number Diff line
@@ -518,7 +518,8 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq) 


    switch (ioreq->req.operation) {

    case BLKIF_OP_READ:

        bdrv_acct_start(blkdev->bs, &ioreq->acct, ioreq->v.size, BDRV_ACCT_READ);

        bdrv_acct_start(blkdev->bs, &ioreq->acct, ioreq->v.size,

                        BLOCK_ACCT_READ);

        ioreq->aio_inflight++;

        bdrv_aio_readv(blkdev->bs, ioreq->start / BLOCK_SIZE,

                       &ioreq->v, ioreq->v.size / BLOCK_SIZE,
@@ -530,7 +531,8 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq) 
            break;

        }



        bdrv_acct_start(blkdev->bs, &ioreq->acct, ioreq->v.size, BDRV_ACCT_WRITE);

        bdrv_acct_start(blkdev->bs, &ioreq->acct, ioreq->v.size,

                        BLOCK_ACCT_WRITE);

        ioreq->aio_inflight++;

        bdrv_aio_writev(blkdev->bs, ioreq->start / BLOCK_SIZE,

                        &ioreq->v, ioreq->v.size / BLOCK_SIZE,