diff options
| author | Markus Armbruster <armbru@redhat.com> | 2012-07-11 15:08:36 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-07-17 16:48:32 +0200 |
| commit | 31e404f4ffb6adadea0b35de08e0a6b640e81a02 (patch) | |
| tree | fa52ec76c7b7cd0fb2170df4e6b94fe0dfd474fc /hw/block-common.h | |
| parent | b51daf003aa42c5c23876739ebd0b64dd2075931 (diff) | |
| download | qemu-31e404f4ffb6adadea0b35de08e0a6b640e81a02.zip qemu-31e404f4ffb6adadea0b35de08e0a6b640e81a02.tar.gz qemu-31e404f4ffb6adadea0b35de08e0a6b640e81a02.tar.bz2 | |
hw/block-common: Move BlockConf & friends from block.h
This stuff doesn't belong to block layer, and was put there only
because a better home didn't exist then. Now it does.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/block-common.h')
| -rw-r--r-- | hw/block-common.h | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/hw/block-common.h b/hw/block-common.h index 31e12ba..f0d509b 100644 --- a/hw/block-common.h +++ b/hw/block-common.h @@ -13,6 +13,51 @@ #include "qemu-common.h" +/* Configuration */ + +typedef struct BlockConf { + BlockDriverState *bs; + uint16_t physical_block_size; + uint16_t logical_block_size; + uint16_t min_io_size; + uint32_t opt_io_size; + int32_t bootindex; + uint32_t discard_granularity; + /* geometry, not all devices use this */ + uint32_t cyls, heads, secs; +} BlockConf; + +static inline unsigned int get_physical_block_exp(BlockConf *conf) +{ + unsigned int exp = 0, size; + + for (size = conf->physical_block_size; + size > conf->logical_block_size; + size >>= 1) { + exp++; + } + + return exp; +} + +#define DEFINE_BLOCK_PROPERTIES(_state, _conf) \ + DEFINE_PROP_DRIVE("drive", _state, _conf.bs), \ + DEFINE_PROP_BLOCKSIZE("logical_block_size", _state, \ + _conf.logical_block_size, 512), \ + 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), \ + DEFINE_PROP_INT32("bootindex", _state, _conf.bootindex, -1), \ + DEFINE_PROP_UINT32("discard_granularity", _state, \ + _conf.discard_granularity, 0) + +#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) + + /* Hard disk geometry */ #define BIOS_ATA_TRANSLATION_AUTO 0 |