Commit 01762e03 authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

virtio-blk: Account for failed and invalid operations 



Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Message-id: 4f623ce52c9d673d35a043fc2959526b41b685c6.1446044838.git.berto@igalia.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 1753f3dc

hw/block/virtio-blk.c

+3 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int virtio_blk_handle_rw_error(VirtIOBlockReq *req, int error, 
        s->rq = req;

    } else if (action == BLOCK_ERROR_ACTION_REPORT) {

        virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR);

        block_acct_done(blk_get_stats(s->blk), &req->acct);

        block_acct_failed(blk_get_stats(s->blk), &req->acct);

        virtio_blk_free_request(req);

    }
@@ -536,6 +536,8 @@ void virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb) 
        if (!virtio_blk_sect_range_ok(req->dev, req->sector_num,

                                      req->qiov.size)) {

            virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR);

            block_acct_invalid(blk_get_stats(req->dev->blk),

                               is_write ? BLOCK_ACCT_WRITE : BLOCK_ACCT_READ);

            virtio_blk_free_request(req);

            return;

        }