[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 02/10] virtio-blk: add host_features field in Vir
From: |
Stefano Garzarella |
Subject: |
[Qemu-devel] [PATCH v6 02/10] virtio-blk: add host_features field in VirtIOBlock |
Date: |
Thu, 21 Feb 2019 11:33:06 +0100 |
Since configurable features for virtio-blk are growing, this patch
adds host_features field in the struct VirtIOBlock. (as in virtio-net)
In this way, we can avoid to add new fields for new properties and
we can directly set VIRTIO_BLK_F* flags in the host_features.
We update "config-wce" and "scsi" property definition to use the new
host_features field without change the behaviour.
Suggested-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Stefano Garzarella <address@hidden>
---
hw/block/virtio-blk.c | 16 +++++++++-------
include/hw/virtio/virtio-blk.h | 3 +--
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index afedf48ca6..7813237756 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -245,7 +245,7 @@ static int virtio_blk_handle_scsi_req(VirtIOBlockReq *req)
*/
scsi = (void *)elem->in_sg[elem->in_num - 2].iov_base;
- if (!blk->conf.scsi) {
+ if (!virtio_has_feature(blk->host_features, VIRTIO_BLK_F_SCSI)) {
status = VIRTIO_BLK_S_UNSUPP;
goto fail;
}
@@ -785,12 +785,15 @@ static uint64_t virtio_blk_get_features(VirtIODevice
*vdev, uint64_t features,
{
VirtIOBlock *s = VIRTIO_BLK(vdev);
+ /* Firstly sync all virtio-blk possible supported features */
+ features |= s->host_features;
+
virtio_add_feature(&features, VIRTIO_BLK_F_SEG_MAX);
virtio_add_feature(&features, VIRTIO_BLK_F_GEOMETRY);
virtio_add_feature(&features, VIRTIO_BLK_F_TOPOLOGY);
virtio_add_feature(&features, VIRTIO_BLK_F_BLK_SIZE);
if (virtio_has_feature(features, VIRTIO_F_VERSION_1)) {
- if (s->conf.scsi) {
+ if (virtio_has_feature(s->host_features, VIRTIO_BLK_F_SCSI)) {
error_setg(errp, "Please set scsi=off for virtio-blk devices in
order to use virtio 1.0");
return 0;
}
@@ -799,9 +802,6 @@ static uint64_t virtio_blk_get_features(VirtIODevice *vdev,
uint64_t features,
virtio_add_feature(&features, VIRTIO_BLK_F_SCSI);
}
- if (s->conf.config_wce) {
- virtio_add_feature(&features, VIRTIO_BLK_F_CONFIG_WCE);
- }
if (blk_enable_write_cache(s->blk)) {
virtio_add_feature(&features, VIRTIO_BLK_F_WCE);
}
@@ -1015,9 +1015,11 @@ static Property virtio_blk_properties[] = {
DEFINE_BLOCK_ERROR_PROPERTIES(VirtIOBlock, conf.conf),
DEFINE_BLOCK_CHS_PROPERTIES(VirtIOBlock, conf.conf),
DEFINE_PROP_STRING("serial", VirtIOBlock, conf.serial),
- DEFINE_PROP_BIT("config-wce", VirtIOBlock, conf.config_wce, 0, true),
+ DEFINE_PROP_BIT64("config-wce", VirtIOBlock, host_features,
+ VIRTIO_BLK_F_CONFIG_WCE, true),
#ifdef __linux__
- DEFINE_PROP_BIT("scsi", VirtIOBlock, conf.scsi, 0, false),
+ DEFINE_PROP_BIT64("scsi", VirtIOBlock, host_features,
+ VIRTIO_BLK_F_SCSI, false),
#endif
DEFINE_PROP_BIT("request-merging", VirtIOBlock, conf.request_merging, 0,
true),
diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h
index 5117431d96..f7345b0511 100644
--- a/include/hw/virtio/virtio-blk.h
+++ b/include/hw/virtio/virtio-blk.h
@@ -35,8 +35,6 @@ struct VirtIOBlkConf
BlockConf conf;
IOThread *iothread;
char *serial;
- uint32_t scsi;
- uint32_t config_wce;
uint32_t request_merging;
uint16_t num_queues;
uint16_t queue_size;
@@ -57,6 +55,7 @@ typedef struct VirtIOBlock {
bool dataplane_disabled;
bool dataplane_started;
struct VirtIOBlockDataPlane *dataplane;
+ uint64_t host_features;
} VirtIOBlock;
typedef struct VirtIOBlockReq {
--
2.20.1
- [Qemu-devel] [PATCH v6 00/10] virtio-blk: add DISCARD and WRITE_ZEROES features, Stefano Garzarella, 2019/02/21
- [Qemu-devel] [PATCH v6 02/10] virtio-blk: add host_features field in VirtIOBlock,
Stefano Garzarella <=
- [Qemu-devel] [PATCH v6 01/10] virtio-blk: add acct_failed param to virtio_blk_handle_rw_error(), Stefano Garzarella, 2019/02/21
- [Qemu-devel] [PATCH v6 03/10] virtio-blk: add "discard" and "write-zeroes" properties, Stefano Garzarella, 2019/02/21
- [Qemu-devel] [PATCH v6 04/10] virtio-net: make VirtIOFeature usable for other virtio devices, Stefano Garzarella, 2019/02/21
- [Qemu-devel] [PATCH v6 07/10] tests/virtio-blk: change assert on data_size in virtio_blk_request(), Stefano Garzarella, 2019/02/21
- [Qemu-devel] [PATCH v6 06/10] virtio-blk: add DISCARD and WRITE_ZEROES features, Stefano Garzarella, 2019/02/21
- [Qemu-devel] [PATCH v6 08/10] tests/virtio-blk: add virtio_blk_fix_dwz_hdr() function, Stefano Garzarella, 2019/02/21
- [Qemu-devel] [PATCH v6 05/10] virtio-blk: set config size depending on the features enabled, Stefano Garzarella, 2019/02/21
- [Qemu-devel] [PATCH v6 09/10] tests/virtio-blk: add test for WRITE_ZEROES command, Stefano Garzarella, 2019/02/21
- [Qemu-devel] [PATCH v6 10/10] tests/virtio-blk: add test for DISCARD command, Stefano Garzarella, 2019/02/21
- Re: [Qemu-devel] [PATCH v6 00/10] virtio-blk: add DISCARD and WRITE_ZEROES features, Stefan Hajnoczi, 2019/02/22