Commit abd7f68d authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

block: Move error actions from DriveInfo to BlockDriverState 



That's where they belong semantically (block device host part), even
though the actions are actually executed by guest device code.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 2063392a

block.c

+12 −0
Original line number Diff line number Diff line
@@ -1206,6 +1206,18 @@ int bdrv_get_translation_hint(BlockDriverState *bs) 
    return bs->translation;

}



void bdrv_set_on_error(BlockDriverState *bs, BlockErrorAction on_read_error,

                       BlockErrorAction on_write_error)

{

    bs->on_read_error = on_read_error;

    bs->on_write_error = on_write_error;

}



BlockErrorAction bdrv_get_on_error(BlockDriverState *bs, int is_read)

{

    return is_read ? bs->on_read_error : bs->on_write_error;

}



int bdrv_is_removable(BlockDriverState *bs)

{

    return bs->removable;

block.h

+8 −0
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ typedef struct QEMUSnapshotInfo { 
#define BDRV_SECTOR_SIZE   (1ULL << BDRV_SECTOR_BITS)

#define BDRV_SECTOR_MASK   ~(BDRV_SECTOR_SIZE - 1)



typedef enum {

    BLOCK_ERR_REPORT, BLOCK_ERR_IGNORE, BLOCK_ERR_STOP_ENOSPC,

    BLOCK_ERR_STOP_ANY

} BlockErrorAction;



typedef enum {

    BDRV_ACTION_REPORT, BDRV_ACTION_IGNORE, BDRV_ACTION_STOP

} BlockMonEventAction;
@@ -146,6 +151,9 @@ void bdrv_get_geometry_hint(BlockDriverState *bs, 
                            int *pcyls, int *pheads, int *psecs);

int bdrv_get_type_hint(BlockDriverState *bs);

int bdrv_get_translation_hint(BlockDriverState *bs);

void bdrv_set_on_error(BlockDriverState *bs, BlockErrorAction on_read_error,

                       BlockErrorAction on_write_error);

BlockErrorAction bdrv_get_on_error(BlockDriverState *bs, int is_read);

int bdrv_is_removable(BlockDriverState *bs);

int bdrv_is_read_only(BlockDriverState *bs);

int bdrv_is_sg(BlockDriverState *bs);

block_int.h

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ struct BlockDriverState { 
       drivers. They are not used by the block driver */

    int cyls, heads, secs, translation;

    int type;

    BlockErrorAction on_read_error, on_write_error;

    char device_name[32];

    unsigned long *dirty_bitmap;

    int64_t dirty_count;

blockdev.c

+2 −15
Original line number Diff line number Diff line
@@ -90,19 +90,6 @@ const char *drive_get_serial(BlockDriverState *bdrv) 
    return "\0";

}



BlockInterfaceErrorAction drive_get_on_error(

    BlockDriverState *bdrv, int is_read)

{

    DriveInfo *dinfo;



    QTAILQ_FOREACH(dinfo, &drives, next) {

        if (dinfo->bdrv == bdrv)

            return is_read ? dinfo->on_read_error : dinfo->on_write_error;

    }



    return is_read ? BLOCK_ERR_REPORT : BLOCK_ERR_STOP_ENOSPC;

}



static void bdrv_format_print(void *opaque, const char *name)

{

    fprintf(stderr, " %s", name);
@@ -418,13 +405,13 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi, int *fatal_error) 
    dinfo->type = type;

    dinfo->bus = bus_id;

    dinfo->unit = unit_id;

    dinfo->on_read_error = on_read_error;

    dinfo->on_write_error = on_write_error;

    dinfo->opts = opts;

    if (serial)

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

    QTAILQ_INSERT_TAIL(&drives, dinfo, next);



    bdrv_set_on_error(dinfo->bdrv, on_read_error, on_write_error);



    switch(type) {

    case IF_IDE:

    case IF_SCSI:

blockdev.h

+0 −10
Original line number Diff line number Diff line
@@ -19,11 +19,6 @@ typedef enum { 
    IF_COUNT

} BlockInterfaceType;



typedef enum {

    BLOCK_ERR_REPORT, BLOCK_ERR_IGNORE, BLOCK_ERR_STOP_ENOSPC,

    BLOCK_ERR_STOP_ANY

} BlockInterfaceErrorAction;



#define BLOCK_SERIAL_STRLEN 20



typedef struct DriveInfo {
@@ -34,8 +29,6 @@ typedef struct DriveInfo { 
    int bus;

    int unit;

    QemuOpts *opts;

    BlockInterfaceErrorAction on_read_error;

    BlockInterfaceErrorAction on_write_error;

    char serial[BLOCK_SERIAL_STRLEN + 1];

    QTAILQ_ENTRY(DriveInfo) next;

} DriveInfo;
@@ -51,9 +44,6 @@ 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_on_error(

    BlockDriverState *bdrv, int is_read);



extern QemuOpts *drive_add(const char *file, const char *fmt, ...);

extern DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi,

                             int *fatal_error);