Commit f35d68f0 authored by Kevin Wolf's avatar Kevin Wolf Committed by Anthony Liguori
Browse files

virtio-blk: Implement rerror option 



Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent ce4b6522

hw/virtio-blk.c

+8 −5
Original line number Diff line number Diff line
@@ -98,9 +98,11 @@ static void virtio_blk_req_complete(VirtIOBlockReq *req, int status) 
    qemu_free(req);

}



static int virtio_blk_handle_write_error(VirtIOBlockReq *req, int error)

static int virtio_blk_handle_rw_error(VirtIOBlockReq *req, int error,

    int is_read)

{

    BlockInterfaceErrorAction action = drive_get_on_error(req->dev->bs, 0);

    BlockInterfaceErrorAction action =

        drive_get_on_error(req->dev->bs, is_read);

    VirtIOBlock *s = req->dev;



    if (action == BLOCK_ERR_IGNORE)
@@ -122,12 +124,13 @@ static void virtio_blk_rw_complete(void *opaque, int ret) 
{

    VirtIOBlockReq *req = opaque;



    if (ret && (req->out->type & VIRTIO_BLK_T_OUT)) {

        if (virtio_blk_handle_write_error(req, -ret))

    if (ret) {

        int is_read = !(req->out->type & VIRTIO_BLK_T_OUT);

        if (virtio_blk_handle_rw_error(req, -ret, is_read))

            return;

    }



    virtio_blk_req_complete(req, ret ? VIRTIO_BLK_S_IOERR : VIRTIO_BLK_S_OK);

    virtio_blk_req_complete(req, VIRTIO_BLK_S_OK);

}



static void virtio_blk_flush_complete(void *opaque, int ret)

vl.c

+1 −1
Original line number Diff line number Diff line
@@ -2198,7 +2198,7 @@ DriveInfo *drive_init(QemuOpts *opts, void *opaque, 


    on_read_error = BLOCK_ERR_REPORT;

    if ((buf = qemu_opt_get(opts, "rerror")) != NULL) {

        if (type != IF_IDE) {

        if (type != IF_IDE && type != IF_VIRTIO) {

            fprintf(stderr, "rerror is no supported by this format\n");

            return NULL;

        }