IO_CODE and IO_OR_GS_CODE for block-backend I/O API
Mark all I/O functions with IO_CODE, and all "I/O OR GS" with IO_OR_GS_CODE. Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> Message-Id: <20220303151616.325444-10-eesposit@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Emanuele Giuseppe Esposito
Kevin Wolf
parent
0439c5a462
commit
37868b2ac6
|
|
@ -733,6 +733,7 @@ void monitor_remove_blk(BlockBackend *blk)
|
|||
*/
|
||||
const char *blk_name(const BlockBackend *blk)
|
||||
{
|
||||
IO_CODE();
|
||||
return blk->name ?: "";
|
||||
}
|
||||
|
||||
|
|
@ -759,6 +760,7 @@ BlockBackend *blk_by_name(const char *name)
|
|||
*/
|
||||
BlockDriverState *blk_bs(BlockBackend *blk)
|
||||
{
|
||||
IO_CODE();
|
||||
return blk->root ? blk->root->bs : NULL;
|
||||
}
|
||||
|
||||
|
|
@ -1009,6 +1011,7 @@ DeviceState *blk_get_attached_dev(BlockBackend *blk)
|
|||
char *blk_get_attached_dev_id(BlockBackend *blk)
|
||||
{
|
||||
DeviceState *dev = blk->dev;
|
||||
IO_CODE();
|
||||
|
||||
if (!dev) {
|
||||
return g_strdup("");
|
||||
|
|
@ -1171,6 +1174,7 @@ void blk_iostatus_enable(BlockBackend *blk)
|
|||
* enables it _and_ the VM is configured to stop on errors */
|
||||
bool blk_iostatus_is_enabled(const BlockBackend *blk)
|
||||
{
|
||||
IO_CODE();
|
||||
return (blk->iostatus_enabled &&
|
||||
(blk->on_write_error == BLOCKDEV_ON_ERROR_ENOSPC ||
|
||||
blk->on_write_error == BLOCKDEV_ON_ERROR_STOP ||
|
||||
|
|
@ -1199,6 +1203,7 @@ void blk_iostatus_reset(BlockBackend *blk)
|
|||
|
||||
void blk_iostatus_set_err(BlockBackend *blk, int error)
|
||||
{
|
||||
IO_CODE();
|
||||
assert(blk_iostatus_is_enabled(blk));
|
||||
if (blk->iostatus == BLOCK_DEVICE_IO_STATUS_OK) {
|
||||
blk->iostatus = error == ENOSPC ? BLOCK_DEVICE_IO_STATUS_NOSPACE :
|
||||
|
|
@ -1208,16 +1213,19 @@ void blk_iostatus_set_err(BlockBackend *blk, int error)
|
|||
|
||||
void blk_set_allow_write_beyond_eof(BlockBackend *blk, bool allow)
|
||||
{
|
||||
IO_CODE();
|
||||
blk->allow_write_beyond_eof = allow;
|
||||
}
|
||||
|
||||
void blk_set_allow_aio_context_change(BlockBackend *blk, bool allow)
|
||||
{
|
||||
IO_CODE();
|
||||
blk->allow_aio_context_change = allow;
|
||||
}
|
||||
|
||||
void blk_set_disable_request_queuing(BlockBackend *blk, bool disable)
|
||||
{
|
||||
IO_CODE();
|
||||
blk->disable_request_queuing = disable;
|
||||
}
|
||||
|
||||
|
|
@ -1301,6 +1309,7 @@ int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
|
|||
BdrvRequestFlags flags)
|
||||
{
|
||||
int ret;
|
||||
IO_OR_GS_CODE();
|
||||
|
||||
blk_inc_in_flight(blk);
|
||||
ret = blk_co_do_preadv(blk, offset, bytes, qiov, flags);
|
||||
|
|
@ -1352,6 +1361,7 @@ int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset,
|
|||
BdrvRequestFlags flags)
|
||||
{
|
||||
int ret;
|
||||
IO_OR_GS_CODE();
|
||||
|
||||
blk_inc_in_flight(blk);
|
||||
ret = blk_co_do_pwritev_part(blk, offset, bytes, qiov, qiov_offset, flags);
|
||||
|
|
@ -1364,6 +1374,7 @@ int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,
|
|||
int64_t bytes, QEMUIOVector *qiov,
|
||||
BdrvRequestFlags flags)
|
||||
{
|
||||
IO_OR_GS_CODE();
|
||||
return blk_co_pwritev_part(blk, offset, bytes, qiov, 0, flags);
|
||||
}
|
||||
|
||||
|
|
@ -1392,6 +1403,7 @@ typedef struct BlkRwCo {
|
|||
int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
|
||||
int64_t bytes, BdrvRequestFlags flags)
|
||||
{
|
||||
IO_OR_GS_CODE();
|
||||
return blk_pwritev_part(blk, offset, bytes, NULL, 0,
|
||||
flags | BDRV_REQ_ZERO_WRITE);
|
||||
}
|
||||
|
|
@ -1404,11 +1416,13 @@ int blk_make_zero(BlockBackend *blk, BdrvRequestFlags flags)
|
|||
|
||||
void blk_inc_in_flight(BlockBackend *blk)
|
||||
{
|
||||
IO_CODE();
|
||||
qatomic_inc(&blk->in_flight);
|
||||
}
|
||||
|
||||
void blk_dec_in_flight(BlockBackend *blk)
|
||||
{
|
||||
IO_CODE();
|
||||
qatomic_dec(&blk->in_flight);
|
||||
aio_wait_kick();
|
||||
}
|
||||
|
|
@ -1427,6 +1441,7 @@ BlockAIOCB *blk_abort_aio_request(BlockBackend *blk,
|
|||
void *opaque, int ret)
|
||||
{
|
||||
struct BlockBackendAIOCB *acb;
|
||||
IO_CODE();
|
||||
|
||||
blk_inc_in_flight(blk);
|
||||
acb = blk_aio_get(&block_backend_aiocb_info, blk, cb, opaque);
|
||||
|
|
@ -1534,6 +1549,7 @@ BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset,
|
|||
int64_t bytes, BdrvRequestFlags flags,
|
||||
BlockCompletionFunc *cb, void *opaque)
|
||||
{
|
||||
IO_CODE();
|
||||
return blk_aio_prwv(blk, offset, bytes, NULL, blk_aio_write_entry,
|
||||
flags | BDRV_REQ_ZERO_WRITE, cb, opaque);
|
||||
}
|
||||
|
|
@ -1542,6 +1558,7 @@ int blk_pread(BlockBackend *blk, int64_t offset, void *buf, int bytes)
|
|||
{
|
||||
int ret;
|
||||
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
|
||||
IO_OR_GS_CODE();
|
||||
|
||||
blk_inc_in_flight(blk);
|
||||
ret = blk_do_preadv(blk, offset, bytes, &qiov, 0);
|
||||
|
|
@ -1555,6 +1572,7 @@ int blk_pwrite(BlockBackend *blk, int64_t offset, const void *buf, int bytes,
|
|||
{
|
||||
int ret;
|
||||
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
|
||||
IO_OR_GS_CODE();
|
||||
|
||||
ret = blk_pwritev_part(blk, offset, bytes, &qiov, 0, flags);
|
||||
|
||||
|
|
@ -1563,6 +1581,7 @@ int blk_pwrite(BlockBackend *blk, int64_t offset, const void *buf, int bytes,
|
|||
|
||||
int64_t blk_getlength(BlockBackend *blk)
|
||||
{
|
||||
IO_CODE();
|
||||
if (!blk_is_available(blk)) {
|
||||
return -ENOMEDIUM;
|
||||
}
|
||||
|
|
@ -1572,6 +1591,7 @@ int64_t blk_getlength(BlockBackend *blk)
|
|||
|
||||
void blk_get_geometry(BlockBackend *blk, uint64_t *nb_sectors_ptr)
|
||||
{
|
||||
IO_CODE();
|
||||
if (!blk_bs(blk)) {
|
||||
*nb_sectors_ptr = 0;
|
||||
} else {
|
||||
|
|
@ -1581,6 +1601,7 @@ void blk_get_geometry(BlockBackend *blk, uint64_t *nb_sectors_ptr)
|
|||
|
||||
int64_t blk_nb_sectors(BlockBackend *blk)
|
||||
{
|
||||
IO_CODE();
|
||||
if (!blk_is_available(blk)) {
|
||||
return -ENOMEDIUM;
|
||||
}
|
||||
|
|
@ -1592,6 +1613,7 @@ BlockAIOCB *blk_aio_preadv(BlockBackend *blk, int64_t offset,
|
|||
QEMUIOVector *qiov, BdrvRequestFlags flags,
|
||||
BlockCompletionFunc *cb, void *opaque)
|
||||
{
|
||||
IO_CODE();
|
||||
assert((uint64_t)qiov->size <= INT64_MAX);
|
||||
return blk_aio_prwv(blk, offset, qiov->size, qiov,
|
||||
blk_aio_read_entry, flags, cb, opaque);
|
||||
|
|
@ -1601,6 +1623,7 @@ BlockAIOCB *blk_aio_pwritev(BlockBackend *blk, int64_t offset,
|
|||
QEMUIOVector *qiov, BdrvRequestFlags flags,
|
||||
BlockCompletionFunc *cb, void *opaque)
|
||||
{
|
||||
IO_CODE();
|
||||
assert((uint64_t)qiov->size <= INT64_MAX);
|
||||
return blk_aio_prwv(blk, offset, qiov->size, qiov,
|
||||
blk_aio_write_entry, flags, cb, opaque);
|
||||
|
|
@ -1614,6 +1637,7 @@ void blk_aio_cancel(BlockAIOCB *acb)
|
|||
|
||||
void blk_aio_cancel_async(BlockAIOCB *acb)
|
||||
{
|
||||
IO_CODE();
|
||||
bdrv_aio_cancel_async(acb);
|
||||
}
|
||||
|
||||
|
|
@ -1633,6 +1657,7 @@ blk_co_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf)
|
|||
int blk_ioctl(BlockBackend *blk, unsigned long int req, void *buf)
|
||||
{
|
||||
int ret;
|
||||
IO_OR_GS_CODE();
|
||||
|
||||
blk_inc_in_flight(blk);
|
||||
ret = blk_do_ioctl(blk, req, buf);
|
||||
|
|
@ -1654,6 +1679,7 @@ static void blk_aio_ioctl_entry(void *opaque)
|
|||
BlockAIOCB *blk_aio_ioctl(BlockBackend *blk, unsigned long int req, void *buf,
|
||||
BlockCompletionFunc *cb, void *opaque)
|
||||
{
|
||||
IO_CODE();
|
||||
return blk_aio_prwv(blk, req, 0, buf, blk_aio_ioctl_entry, 0, cb, opaque);
|
||||
}
|
||||
|
||||
|
|
@ -1686,6 +1712,7 @@ BlockAIOCB *blk_aio_pdiscard(BlockBackend *blk,
|
|||
int64_t offset, int64_t bytes,
|
||||
BlockCompletionFunc *cb, void *opaque)
|
||||
{
|
||||
IO_CODE();
|
||||
return blk_aio_prwv(blk, offset, bytes, NULL, blk_aio_pdiscard_entry, 0,
|
||||
cb, opaque);
|
||||
}
|
||||
|
|
@ -1694,6 +1721,7 @@ int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset,
|
|||
int64_t bytes)
|
||||
{
|
||||
int ret;
|
||||
IO_OR_GS_CODE();
|
||||
|
||||
blk_inc_in_flight(blk);
|
||||
ret = blk_co_do_pdiscard(blk, offset, bytes);
|
||||
|
|
@ -1705,6 +1733,7 @@ int coroutine_fn blk_co_pdiscard(BlockBackend *blk, int64_t offset,
|
|||
int blk_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes)
|
||||
{
|
||||
int ret;
|
||||
IO_OR_GS_CODE();
|
||||
|
||||
blk_inc_in_flight(blk);
|
||||
ret = blk_do_pdiscard(blk, offset, bytes);
|
||||
|
|
@ -1737,12 +1766,14 @@ static void blk_aio_flush_entry(void *opaque)
|
|||
BlockAIOCB *blk_aio_flush(BlockBackend *blk,
|
||||
BlockCompletionFunc *cb, void *opaque)
|
||||
{
|
||||
IO_CODE();
|
||||
return blk_aio_prwv(blk, 0, 0, NULL, blk_aio_flush_entry, 0, cb, opaque);
|
||||
}
|
||||
|
||||
int coroutine_fn blk_co_flush(BlockBackend *blk)
|
||||
{
|
||||
int ret;
|
||||
IO_OR_GS_CODE();
|
||||
|
||||
blk_inc_in_flight(blk);
|
||||
ret = blk_co_do_flush(blk);
|
||||
|
|
@ -1814,6 +1845,7 @@ void blk_set_on_error(BlockBackend *blk, BlockdevOnError on_read_error,
|
|||
|
||||
BlockdevOnError blk_get_on_error(BlockBackend *blk, bool is_read)
|
||||
{
|
||||
IO_CODE();
|
||||
return is_read ? blk->on_read_error : blk->on_write_error;
|
||||
}
|
||||
|
||||
|
|
@ -1821,6 +1853,7 @@ BlockErrorAction blk_get_error_action(BlockBackend *blk, bool is_read,
|
|||
int error)
|
||||
{
|
||||
BlockdevOnError on_err = blk_get_on_error(blk, is_read);
|
||||
IO_CODE();
|
||||
|
||||
switch (on_err) {
|
||||
case BLOCKDEV_ON_ERROR_ENOSPC:
|
||||
|
|
@ -1860,6 +1893,7 @@ void blk_error_action(BlockBackend *blk, BlockErrorAction action,
|
|||
bool is_read, int error)
|
||||
{
|
||||
assert(error >= 0);
|
||||
IO_CODE();
|
||||
|
||||
if (action == BLOCK_ERROR_ACTION_STOP) {
|
||||
/* First set the iostatus, so that "info block" returns an iostatus
|
||||
|
|
@ -1906,6 +1940,7 @@ bool blk_supports_write_perm(BlockBackend *blk)
|
|||
*/
|
||||
bool blk_is_writable(BlockBackend *blk)
|
||||
{
|
||||
IO_CODE();
|
||||
return blk->perm & BLK_PERM_WRITE;
|
||||
}
|
||||
|
||||
|
|
@ -1923,6 +1958,7 @@ bool blk_is_sg(BlockBackend *blk)
|
|||
|
||||
bool blk_enable_write_cache(BlockBackend *blk)
|
||||
{
|
||||
IO_CODE();
|
||||
return blk->enable_write_cache;
|
||||
}
|
||||
|
||||
|
|
@ -1948,18 +1984,21 @@ void blk_activate(BlockBackend *blk, Error **errp)
|
|||
bool blk_is_inserted(BlockBackend *blk)
|
||||
{
|
||||
BlockDriverState *bs = blk_bs(blk);
|
||||
IO_CODE();
|
||||
|
||||
return bs && bdrv_is_inserted(bs);
|
||||
}
|
||||
|
||||
bool blk_is_available(BlockBackend *blk)
|
||||
{
|
||||
IO_CODE();
|
||||
return blk_is_inserted(blk) && !blk_dev_is_tray_open(blk);
|
||||
}
|
||||
|
||||
void blk_lock_medium(BlockBackend *blk, bool locked)
|
||||
{
|
||||
BlockDriverState *bs = blk_bs(blk);
|
||||
IO_CODE();
|
||||
|
||||
if (bs) {
|
||||
bdrv_lock_medium(bs, locked);
|
||||
|
|
@ -1970,6 +2009,7 @@ void blk_eject(BlockBackend *blk, bool eject_flag)
|
|||
{
|
||||
BlockDriverState *bs = blk_bs(blk);
|
||||
char *id;
|
||||
IO_CODE();
|
||||
|
||||
if (bs) {
|
||||
bdrv_eject(bs, eject_flag);
|
||||
|
|
@ -1999,6 +2039,7 @@ int blk_get_flags(BlockBackend *blk)
|
|||
uint32_t blk_get_request_alignment(BlockBackend *blk)
|
||||
{
|
||||
BlockDriverState *bs = blk_bs(blk);
|
||||
IO_CODE();
|
||||
return bs ? bs->bl.request_alignment : BDRV_SECTOR_SIZE;
|
||||
}
|
||||
|
||||
|
|
@ -2007,6 +2048,7 @@ uint64_t blk_get_max_hw_transfer(BlockBackend *blk)
|
|||
{
|
||||
BlockDriverState *bs = blk_bs(blk);
|
||||
uint64_t max = INT_MAX;
|
||||
IO_CODE();
|
||||
|
||||
if (bs) {
|
||||
max = MIN_NON_ZERO(max, bs->bl.max_hw_transfer);
|
||||
|
|
@ -2020,6 +2062,7 @@ uint32_t blk_get_max_transfer(BlockBackend *blk)
|
|||
{
|
||||
BlockDriverState *bs = blk_bs(blk);
|
||||
uint32_t max = INT_MAX;
|
||||
IO_CODE();
|
||||
|
||||
if (bs) {
|
||||
max = MIN_NON_ZERO(max, bs->bl.max_transfer);
|
||||
|
|
@ -2029,27 +2072,32 @@ uint32_t blk_get_max_transfer(BlockBackend *blk)
|
|||
|
||||
int blk_get_max_hw_iov(BlockBackend *blk)
|
||||
{
|
||||
IO_CODE();
|
||||
return MIN_NON_ZERO(blk->root->bs->bl.max_hw_iov,
|
||||
blk->root->bs->bl.max_iov);
|
||||
}
|
||||
|
||||
int blk_get_max_iov(BlockBackend *blk)
|
||||
{
|
||||
IO_CODE();
|
||||
return blk->root->bs->bl.max_iov;
|
||||
}
|
||||
|
||||
void blk_set_guest_block_size(BlockBackend *blk, int align)
|
||||
{
|
||||
IO_CODE();
|
||||
blk->guest_block_size = align;
|
||||
}
|
||||
|
||||
void *blk_try_blockalign(BlockBackend *blk, size_t size)
|
||||
{
|
||||
IO_CODE();
|
||||
return qemu_try_blockalign(blk ? blk_bs(blk) : NULL, size);
|
||||
}
|
||||
|
||||
void *blk_blockalign(BlockBackend *blk, size_t size)
|
||||
{
|
||||
IO_CODE();
|
||||
return qemu_blockalign(blk ? blk_bs(blk) : NULL, size);
|
||||
}
|
||||
|
||||
|
|
@ -2098,6 +2146,7 @@ void blk_op_unblock_all(BlockBackend *blk, Error *reason)
|
|||
AioContext *blk_get_aio_context(BlockBackend *blk)
|
||||
{
|
||||
BlockDriverState *bs = blk_bs(blk);
|
||||
IO_CODE();
|
||||
|
||||
if (bs) {
|
||||
AioContext *ctx = bdrv_get_aio_context(blk_bs(blk));
|
||||
|
|
@ -2243,6 +2292,7 @@ void blk_add_insert_bs_notifier(BlockBackend *blk, Notifier *notify)
|
|||
void blk_io_plug(BlockBackend *blk)
|
||||
{
|
||||
BlockDriverState *bs = blk_bs(blk);
|
||||
IO_CODE();
|
||||
|
||||
if (bs) {
|
||||
bdrv_io_plug(bs);
|
||||
|
|
@ -2252,6 +2302,7 @@ void blk_io_plug(BlockBackend *blk)
|
|||
void blk_io_unplug(BlockBackend *blk)
|
||||
{
|
||||
BlockDriverState *bs = blk_bs(blk);
|
||||
IO_CODE();
|
||||
|
||||
if (bs) {
|
||||
bdrv_io_unplug(bs);
|
||||
|
|
@ -2260,18 +2311,21 @@ void blk_io_unplug(BlockBackend *blk)
|
|||
|
||||
BlockAcctStats *blk_get_stats(BlockBackend *blk)
|
||||
{
|
||||
IO_CODE();
|
||||
return &blk->stats;
|
||||
}
|
||||
|
||||
void *blk_aio_get(const AIOCBInfo *aiocb_info, BlockBackend *blk,
|
||||
BlockCompletionFunc *cb, void *opaque)
|
||||
{
|
||||
IO_CODE();
|
||||
return qemu_aio_get(aiocb_info, blk_bs(blk), cb, opaque);
|
||||
}
|
||||
|
||||
int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset,
|
||||
int64_t bytes, BdrvRequestFlags flags)
|
||||
{
|
||||
IO_OR_GS_CODE();
|
||||
return blk_co_pwritev(blk, offset, bytes, NULL,
|
||||
flags | BDRV_REQ_ZERO_WRITE);
|
||||
}
|
||||
|
|
@ -2280,6 +2334,7 @@ int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf,
|
|||
int64_t bytes)
|
||||
{
|
||||
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
|
||||
IO_OR_GS_CODE();
|
||||
return blk_pwritev_part(blk, offset, bytes, &qiov, 0,
|
||||
BDRV_REQ_WRITE_COMPRESSED);
|
||||
}
|
||||
|
|
@ -2287,6 +2342,7 @@ int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf,
|
|||
int blk_truncate(BlockBackend *blk, int64_t offset, bool exact,
|
||||
PreallocMode prealloc, BdrvRequestFlags flags, Error **errp)
|
||||
{
|
||||
IO_OR_GS_CODE();
|
||||
if (!blk_is_available(blk)) {
|
||||
error_setg(errp, "No medium inserted");
|
||||
return -ENOMEDIUM;
|
||||
|
|
@ -2530,6 +2586,8 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in,
|
|||
BdrvRequestFlags write_flags)
|
||||
{
|
||||
int r;
|
||||
IO_CODE();
|
||||
|
||||
r = blk_check_byte_request(blk_in, off_in, bytes);
|
||||
if (r) {
|
||||
return r;
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@ static inline int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset,
|
|||
BdrvRequestFlags flags)
|
||||
{
|
||||
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
|
||||
IO_OR_GS_CODE();
|
||||
|
||||
assert(bytes <= SIZE_MAX);
|
||||
|
||||
|
|
@ -132,6 +133,7 @@ static inline int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset,
|
|||
BdrvRequestFlags flags)
|
||||
{
|
||||
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
|
||||
IO_OR_GS_CODE();
|
||||
|
||||
assert(bytes <= SIZE_MAX);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue