[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 1/5] virtio-blk: decouple config size determination code from
From: |
Daniil Tatianin |
Subject: |
[PATCH v1 1/5] virtio-blk: decouple config size determination code from VirtIOBlock |
Date: |
Wed, 24 Aug 2022 12:18:33 +0300 |
Make it more stand-alone so that we can reuse it for other virtio-blk
devices that are not VirtIOBlock in the future commits.
Signed-off-by: Daniil Tatianin <d-tatianin@yandex-team.ru>
---
hw/block/virtio-blk.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index e9ba752f6b..a4162dbbf2 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -49,12 +49,13 @@ static const VirtIOFeature feature_sizes[] = {
{}
};
-static void virtio_blk_set_config_size(VirtIOBlock *s, uint64_t host_features)
+static size_t virtio_blk_common_get_config_size(uint64_t host_features)
{
- s->config_size = MAX(VIRTIO_BLK_CFG_SIZE,
+ size_t 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));
+ assert(config_size <= sizeof(struct virtio_blk_config));
+ return config_size;
}
static void virtio_blk_init_request(VirtIOBlock *s, VirtQueue *vq,
@@ -1204,7 +1205,7 @@ static void virtio_blk_device_realize(DeviceState *dev,
Error **errp)
return;
}
- virtio_blk_set_config_size(s, s->host_features);
+ s->config_size = virtio_blk_common_get_config_size(s->host_features);
virtio_init(vdev, VIRTIO_ID_BLOCK, s->config_size);
--
2.25.1