Commit 57ee366c authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

xen_disk: Account for failed and invalid operations 



Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Message-id: e0cbb96cb0e1f86c37c7ce332efdf02b57b9d365.1446044838.git.berto@igalia.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 01762e03

hw/block/xen_disk.c

+22 −1
Original line number Diff line number Diff line
@@ -537,7 +537,11 @@ static void qemu_aio_complete(void *opaque, int ret) 
            break;

        }

    case BLKIF_OP_READ:

        if (ioreq->status == BLKIF_RSP_OKAY) {

            block_acct_done(blk_get_stats(ioreq->blkdev->blk), &ioreq->acct);

        } else {

            block_acct_failed(blk_get_stats(ioreq->blkdev->blk), &ioreq->acct);

        }

        break;

    case BLKIF_OP_DISCARD:

    default:
@@ -722,6 +726,23 @@ static void blk_handle_requests(struct XenBlkDev *blkdev) 


        /* parse them */

        if (ioreq_parse(ioreq) != 0) {



            switch (ioreq->req.operation) {

            case BLKIF_OP_READ:

                block_acct_invalid(blk_get_stats(blkdev->blk),

                                   BLOCK_ACCT_READ);

                break;

            case BLKIF_OP_WRITE:

                block_acct_invalid(blk_get_stats(blkdev->blk),

                                   BLOCK_ACCT_WRITE);

                break;

            case BLKIF_OP_FLUSH_DISKCACHE:

                block_acct_invalid(blk_get_stats(blkdev->blk),

                                   BLOCK_ACCT_FLUSH);

            default:

                break;

            };



            if (blk_send_response_one(ioreq)) {

                xen_be_send_notify(&blkdev->xendev);

            }