[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/8] virtio-blk: utilize VirtIOConfigSizeParams & virtio_get_c
From: |
Daniil Tatianin |
Subject: |
[PATCH v2 2/8] virtio-blk: utilize VirtIOConfigSizeParams & virtio_get_config_size |
Date: |
Fri, 26 Aug 2022 17:32:42 +0300 |
Use the common helper instead of duplicating the same logic.
Signed-off-by: Daniil Tatianin <d-tatianin@yandex-team.ru>
---
hw/block/virtio-blk.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index e9ba752f6b..10c47c2934 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -49,13 +49,11 @@ static const VirtIOFeature feature_sizes[] = {
{}
};
-static void virtio_blk_set_config_size(VirtIOBlock *s, uint64_t host_features)
-{
- s->config_size = MAX(VIRTIO_BLK_CFG_SIZE,
- virtio_feature_get_config_size(feature_sizes, host_features));
-
- assert(s->config_size <= sizeof(struct virtio_blk_config));
-}
+static const VirtIOConfigSizeParams cfg_size_params = {
+ .min_size = VIRTIO_BLK_CFG_SIZE,
+ .max_size = sizeof(struct virtio_blk_config),
+ .feature_sizes = feature_sizes
+};
static void virtio_blk_init_request(VirtIOBlock *s, VirtQueue *vq,
VirtIOBlockReq *req)
@@ -1204,8 +1202,8 @@ static void virtio_blk_device_realize(DeviceState *dev,
Error **errp)
return;
}
- virtio_blk_set_config_size(s, s->host_features);
-
+ s->config_size = virtio_get_config_size(&cfg_size_params,
+ s->host_features);
virtio_init(vdev, VIRTIO_ID_BLOCK, s->config_size);
s->blk = conf->conf.blk;
--
2.25.1
- [PATCH v2 0/8] vhost-user-blk: dynamically resize config space based on features, Daniil Tatianin, 2022/08/26
- [PATCH v2 1/8] virtio: introduce VirtIOConfigSizeParams & virtio_get_config_size, Daniil Tatianin, 2022/08/26
- [PATCH v2 3/8] virtio-net: utilize VirtIOConfigSizeParams & virtio_get_config_size, Daniil Tatianin, 2022/08/26
- [PATCH v2 2/8] virtio-blk: utilize VirtIOConfigSizeParams & virtio_get_config_size,
Daniil Tatianin <=
- [PATCH v2 5/8] virtio-blk: move config size params to virtio-blk-common, Daniil Tatianin, 2022/08/26
- [PATCH v2 4/8] virtio: remove the virtio_feature_get_config_size helper, Daniil Tatianin, 2022/08/26
- [PATCH v2 6/8] vhost-user-blk: make it possible to disable write-zeroes/discard, Daniil Tatianin, 2022/08/26
- [PATCH v2 7/8] vhost-user-blk: make 'config_wce' part of 'host_features', Daniil Tatianin, 2022/08/26
- [PATCH v2 8/8] vhost-user-blk: dynamically resize config space based on features, Daniil Tatianin, 2022/08/26