Commit 1fc86bf9 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Kevin Wolf
Browse files

block: enforce constraints on block size properties 



Nicolae Mogoreanu <mogo@google.com> noticed that I/O requests can lead
to QEMU crashes when the logical_block_size property is smaller than 512
bytes.

Using the new "blocksize" property we can properly enforce constraints
on the block size such that QEMU's block layer is able to operate
correctly.

Reported-by: default avatarNicolae Mogoreanu <mogo@google.com>
Reported-by: default avatarMichael Halcrow <mhalcrow@google.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 02fda01c

block.h

+4 −4
Original line number Diff line number Diff line
@@ -435,9 +435,9 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) 


#define DEFINE_BLOCK_PROPERTIES(_state, _conf)                          \

    DEFINE_PROP_DRIVE("drive", _state, _conf.bs),                       \

    DEFINE_PROP_UINT16("logical_block_size", _state,                    \

    DEFINE_PROP_BLOCKSIZE("logical_block_size", _state,                 \

                          _conf.logical_block_size, 512),               \

    DEFINE_PROP_UINT16("physical_block_size", _state,                   \

    DEFINE_PROP_BLOCKSIZE("physical_block_size", _state,                \

                          _conf.physical_block_size, 512),              \

    DEFINE_PROP_UINT16("min_io_size", _state, _conf.min_io_size, 0),  \

    DEFINE_PROP_UINT32("opt_io_size", _state, _conf.opt_io_size, 0),    \