62a6c300f1
Commit 5f76a7aac1 is looking harmless from
the first glance, but it has changed things a lot. 'libvirt' uses it to
detect that it should follow new initialization way and this changes
things considerably. With this procedure followed, blockdev_init() is
not called anymore and thus block_acct_setup() helper is not called.
This means in particular that defaults for block accounting statistics
are changed and account_invalid/account_failed are actually initialized
as false instead of true originally.
This commit changes things to match original world. There are the following
constraints:
* new default value in block_acct_init() is set to true
* block_acct_setup() inside blockdev_init() is called before
blkconf_apply_backend_options()
* thus newly created option in block device properties has precedence if
specified
Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
CC: Peter Krempa <pkrempa@redhat.com>
CC: Markus Armbruster <armbru@redhat.com>
CC: John Snow <jsnow@redhat.com>
CC: Kevin Wolf <kwolf@redhat.com>
CC: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220824095044.166009-3-den@openvz.org>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
111 lines
4.3 KiB
C
111 lines
4.3 KiB
C
/*
|
|
* Common code for block device models
|
|
*
|
|
* Copyright (C) 2012 Red Hat, Inc.
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or
|
|
* later. See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#ifndef HW_BLOCK_H
|
|
#define HW_BLOCK_H
|
|
|
|
#include "exec/hwaddr.h"
|
|
#include "qapi/qapi-types-block-core.h"
|
|
#include "hw/qdev-properties-system.h"
|
|
|
|
/* Configuration */
|
|
|
|
typedef struct BlockConf {
|
|
BlockBackend *blk;
|
|
OnOffAuto backend_defaults;
|
|
uint32_t physical_block_size;
|
|
uint32_t logical_block_size;
|
|
uint32_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;
|
|
uint32_t lcyls, lheads, lsecs;
|
|
OnOffAuto wce;
|
|
bool share_rw;
|
|
OnOffAuto account_invalid, account_failed;
|
|
BlockdevOnError rerror;
|
|
BlockdevOnError werror;
|
|
} 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_BASE(_state, _conf) \
|
|
DEFINE_PROP_ON_OFF_AUTO("backend_defaults", _state, \
|
|
_conf.backend_defaults, ON_OFF_AUTO_AUTO), \
|
|
DEFINE_PROP_BLOCKSIZE("logical_block_size", _state, \
|
|
_conf.logical_block_size), \
|
|
DEFINE_PROP_BLOCKSIZE("physical_block_size", _state, \
|
|
_conf.physical_block_size), \
|
|
DEFINE_PROP_SIZE32("min_io_size", _state, _conf.min_io_size, 0), \
|
|
DEFINE_PROP_SIZE32("opt_io_size", _state, _conf.opt_io_size, 0), \
|
|
DEFINE_PROP_SIZE32("discard_granularity", _state, \
|
|
_conf.discard_granularity, -1), \
|
|
DEFINE_PROP_ON_OFF_AUTO("write-cache", _state, _conf.wce, \
|
|
ON_OFF_AUTO_AUTO), \
|
|
DEFINE_PROP_BOOL("share-rw", _state, _conf.share_rw, false), \
|
|
DEFINE_PROP_ON_OFF_AUTO("account-invalid", _state, \
|
|
_conf.account_invalid, ON_OFF_AUTO_AUTO), \
|
|
DEFINE_PROP_ON_OFF_AUTO("account-failed", _state, \
|
|
_conf.account_failed, ON_OFF_AUTO_AUTO)
|
|
|
|
#define DEFINE_BLOCK_PROPERTIES(_state, _conf) \
|
|
DEFINE_PROP_DRIVE("drive", _state, _conf.blk), \
|
|
DEFINE_BLOCK_PROPERTIES_BASE(_state, _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("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, \
|
|
BLOCKDEV_ON_ERROR_AUTO), \
|
|
DEFINE_PROP_BLOCKDEV_ON_ERROR("werror", _state, _conf.werror, \
|
|
BLOCKDEV_ON_ERROR_AUTO)
|
|
|
|
/* Backend access helpers */
|
|
|
|
bool blk_check_size_and_read_all(BlockBackend *blk, void *buf, hwaddr size,
|
|
Error **errp);
|
|
|
|
/* Configuration helpers */
|
|
|
|
bool blkconf_geometry(BlockConf *conf, int *trans,
|
|
unsigned cyls_max, unsigned heads_max, unsigned secs_max,
|
|
Error **errp);
|
|
bool blkconf_blocksizes(BlockConf *conf, Error **errp);
|
|
bool blkconf_apply_backend_options(BlockConf *conf, bool readonly,
|
|
bool resizable, Error **errp);
|
|
|
|
/* Hard disk geometry */
|
|
|
|
void hd_geometry_guess(BlockBackend *blk,
|
|
uint32_t *pcyls, uint32_t *pheads, uint32_t *psecs,
|
|
int *ptrans);
|
|
int hd_bios_chs_auto_trans(uint32_t cyls, uint32_t heads, uint32_t secs);
|
|
|
|
#endif
|