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

Rename DriveInfo.onerror to on_write_error 



Either rename variables and functions to refer to write errors (which is what
they actually do) or introduce a parameter to distinguish reads and writes.

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

hw/ide/core.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ void ide_dma_error(IDEState *s) 


static int ide_handle_write_error(IDEState *s, int error, int op)

{

    BlockInterfaceErrorAction action = drive_get_onerror(s->bs);

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



    if (action == BLOCK_ERR_IGNORE)

        return 0;

hw/scsi-disk.c

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,8 @@ static void scsi_read_data(SCSIDevice *d, uint32_t tag) 
static int scsi_handle_write_error(SCSIDiskReq *r, int error)

{

    SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);

    BlockInterfaceErrorAction action = drive_get_onerror(s->qdev.dinfo->bdrv);

    BlockInterfaceErrorAction action =

        drive_get_on_error(s->qdev.dinfo->bdrv, 0);



    if (action == BLOCK_ERR_IGNORE)

        return 0;

hw/virtio-blk.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static void virtio_blk_req_complete(VirtIOBlockReq *req, int status) 


static int virtio_blk_handle_write_error(VirtIOBlockReq *req, int error)

{

    BlockInterfaceErrorAction action = drive_get_onerror(req->dev->bs);

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

    VirtIOBlock *s = req->dev;



    if (action == BLOCK_ERR_IGNORE)

sysemu.h

+4 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ typedef struct DriveInfo { 
    int bus;

    int unit;

    QemuOpts *opts;

    BlockInterfaceErrorAction onerror;

    BlockInterfaceErrorAction on_write_error;

    char serial[BLOCK_SERIAL_STRLEN + 1];

    QTAILQ_ENTRY(DriveInfo) next;

} DriveInfo;
@@ -197,7 +197,9 @@ extern DriveInfo *drive_get_by_id(const char *id); 
extern int drive_get_max_bus(BlockInterfaceType type);

extern void drive_uninit(DriveInfo *dinfo);

extern const char *drive_get_serial(BlockDriverState *bdrv);

extern BlockInterfaceErrorAction drive_get_onerror(BlockDriverState *bdrv);



extern BlockInterfaceErrorAction drive_get_on_error(

    BlockDriverState *bdrv, int is_read);



BlockDriverState *qdev_init_bdrv(DeviceState *dev, BlockInterfaceType type);

vl.c

+8 −3
Original line number Diff line number Diff line
@@ -1959,13 +1959,18 @@ const char *drive_get_serial(BlockDriverState *bdrv) 
    return "\0";

}



BlockInterfaceErrorAction drive_get_onerror(BlockDriverState *bdrv)

BlockInterfaceErrorAction drive_get_on_error(

    BlockDriverState *bdrv, int is_read)

{

    DriveInfo *dinfo;



    if (is_read) {

        return BLOCK_ERR_REPORT;

    }



    QTAILQ_FOREACH(dinfo, &drives, next) {

        if (dinfo->bdrv == bdrv)

            return dinfo->onerror;

            return dinfo->on_write_error;

    }



    return BLOCK_ERR_STOP_ENOSPC;
@@ -2263,7 +2268,7 @@ DriveInfo *drive_init(QemuOpts *opts, void *opaque, 
    dinfo->type = type;

    dinfo->bus = bus_id;

    dinfo->unit = unit_id;

    dinfo->onerror = onerror;

    dinfo->on_write_error = onerror;

    dinfo->opts = opts;

    if (serial)

        strncpy(dinfo->serial, serial, sizeof(serial));