Commit 8c398252 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block/qdev: Allow configuring rerror/werror with qdev properties 



The rerror/werror policies are implemented in the devices, so that's
where they should be configured. In comparison to the old options in
-drive, the qdev properties are only added to those devices that
actually support them.

If the option isn't given (or "auto" is specified), the setting of the
BlockBackend is used for compatibility with the old options. For block
jobs, "auto" is the same as "enospc".

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent 1e8fb7f1

block/block-backend.c

+1 −0
Original line number Diff line number Diff line
@@ -1173,6 +1173,7 @@ BlockErrorAction blk_get_error_action(BlockBackend *blk, bool is_read, 
        return BLOCK_ERROR_ACTION_REPORT;

    case BLOCKDEV_ON_ERROR_IGNORE:

        return BLOCK_ERROR_ACTION_IGNORE;

    case BLOCKDEV_ON_ERROR_AUTO:

    default:

        abort();

    }

blockjob.c

+1 −0
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockdevOnError on_err, 


    switch (on_err) {

    case BLOCKDEV_ON_ERROR_ENOSPC:

    case BLOCKDEV_ON_ERROR_AUTO:

        action = (error == ENOSPC) ?

                 BLOCK_ERROR_ACTION_STOP : BLOCK_ERROR_ACTION_REPORT;

        break;

hw/block/block.c

+12 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ void blkconf_blocksizes(BlockConf *conf) 
void blkconf_apply_backend_options(BlockConf *conf)

{

    BlockBackend *blk = conf->blk;

    BlockdevOnError rerror, werror;

    bool wce;



    switch (conf->wce) {
@@ -64,7 +65,18 @@ void blkconf_apply_backend_options(BlockConf *conf) 
        abort();

    }



    rerror = conf->rerror;

    if (rerror == BLOCKDEV_ON_ERROR_AUTO) {

        rerror = blk_get_on_error(blk, true);

    }



    werror = conf->werror;

    if (werror == BLOCKDEV_ON_ERROR_AUTO) {

        werror = blk_get_on_error(blk, false);

    }



    blk_set_enable_write_cache(blk, wce);

    blk_set_on_error(blk, rerror, werror);

}



void blkconf_geometry(BlockConf *conf, int *ptrans,

hw/block/virtio-blk.c

+1 −0
Original line number Diff line number Diff line
@@ -960,6 +960,7 @@ static void virtio_blk_instance_init(Object *obj) 


static Property virtio_blk_properties[] = {

    DEFINE_BLOCK_PROPERTIES(VirtIOBlock, conf.conf),

    DEFINE_BLOCK_ERROR_PROPERTIES(VirtIOBlock, conf.conf),

    DEFINE_BLOCK_CHS_PROPERTIES(VirtIOBlock, conf.conf),

    DEFINE_PROP_STRING("serial", VirtIOBlock, conf.serial),

    DEFINE_PROP_BIT("config-wce", VirtIOBlock, conf.config_wce, 0, true),

hw/core/qdev-properties.c

+13 −0
Original line number Diff line number Diff line
@@ -539,6 +539,19 @@ PropertyInfo qdev_prop_losttickpolicy = { 
    .set   = set_enum,

};



/* --- Block device error handling policy --- */



QEMU_BUILD_BUG_ON(sizeof(BlockdevOnError) != sizeof(int));



PropertyInfo qdev_prop_blockdev_on_error = {

    .name = "BlockdevOnError",

    .description = "Error handling policy, "

                   "report/ignore/enospc/stop/auto",

    .enum_table = BlockdevOnError_lookup,

    .get = get_enum,

    .set = set_enum,

};



/* --- BIOS CHS translation */



QEMU_BUILD_BUG_ON(sizeof(BiosAtaTranslation) != sizeof(int));