Commit 64c5bb83 authored by Sam Eiderman's avatar Sam Eiderman Committed by John Snow
Browse files

block: Support providing LCHS from user 



Add logical geometry variables to BlockConf.

A user can now supply "lcyls", "lheads" & "lsecs" for any HD device
that supports CHS ("cyls", "heads", "secs").

These devices include:
    * ide-hd
    * scsi-hd
    * virtio-blk-pci

In future commits we will use the provided LCHS and pass it to the BIOS
through fw_cfg to be supplied using INT13 routines.

Reviewed-by: default avatarKarl Heubaum <karl.heubaum@oracle.com>
Reviewed-by: default avatarArbel Moshe <arbel.moshe@oracle.com>
Signed-off-by: default avatarSam Eiderman <shmuel.eiderman@oracle.com>
Signed-off-by: default avatarSam Eiderman <sameid@google.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 8e6a1749

include/hw/block/block.h

+5 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ typedef struct BlockConf { 
    uint32_t discard_granularity;

    /* geometry, not all devices use this */

    uint32_t cyls, heads, secs;

    uint32_t lcyls, lheads, lsecs;

    OnOffAuto wce;

    bool share_rw;

    BlockdevOnError rerror;
@@ -65,7 +66,10 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) 
#define DEFINE_BLOCK_CHS_PROPERTIES(_state, _conf)                      \

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

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

    DEFINE_PROP_UINT32("secs", _state, _conf.secs, 0)

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

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

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

    DEFINE_PROP_UINT32("lsecs", _state, _conf.lsecs, 0)



#define DEFINE_BLOCK_ERROR_PROPERTIES(_state, _conf)                    \

    DEFINE_PROP_BLOCKDEV_ON_ERROR("rerror", _state, _conf.rerror,       \