mirror of https://gitee.com/openkylin/qemu.git
virtio-blk: add host_features field in VirtIOBlock
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 <mst@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> Message-id: 20190221103314.58500-3-sgarzare@redhat.com Message-Id: <20190221103314.58500-3-sgarzare@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
00f639fb8f
commit
bbe8bd4d85
|
@ -245,7 +245,7 @@ static int virtio_blk_handle_scsi_req(VirtIOBlockReq *req)
|
||||||
*/
|
*/
|
||||||
scsi = (void *)elem->in_sg[elem->in_num - 2].iov_base;
|
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;
|
status = VIRTIO_BLK_S_UNSUPP;
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
@ -785,12 +785,15 @@ static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features,
|
||||||
{
|
{
|
||||||
VirtIOBlock *s = VIRTIO_BLK(vdev);
|
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_SEG_MAX);
|
||||||
virtio_add_feature(&features, VIRTIO_BLK_F_GEOMETRY);
|
virtio_add_feature(&features, VIRTIO_BLK_F_GEOMETRY);
|
||||||
virtio_add_feature(&features, VIRTIO_BLK_F_TOPOLOGY);
|
virtio_add_feature(&features, VIRTIO_BLK_F_TOPOLOGY);
|
||||||
virtio_add_feature(&features, VIRTIO_BLK_F_BLK_SIZE);
|
virtio_add_feature(&features, VIRTIO_BLK_F_BLK_SIZE);
|
||||||
if (virtio_has_feature(features, VIRTIO_F_VERSION_1)) {
|
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");
|
error_setg(errp, "Please set scsi=off for virtio-blk devices in order to use virtio 1.0");
|
||||||
return 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);
|
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)) {
|
if (blk_enable_write_cache(s->blk)) {
|
||||||
virtio_add_feature(&features, VIRTIO_BLK_F_WCE);
|
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_ERROR_PROPERTIES(VirtIOBlock, conf.conf),
|
||||||
DEFINE_BLOCK_CHS_PROPERTIES(VirtIOBlock, conf.conf),
|
DEFINE_BLOCK_CHS_PROPERTIES(VirtIOBlock, conf.conf),
|
||||||
DEFINE_PROP_STRING("serial", VirtIOBlock, conf.serial),
|
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__
|
#ifdef __linux__
|
||||||
DEFINE_PROP_BIT("scsi", VirtIOBlock, conf.scsi, 0, false),
|
DEFINE_PROP_BIT64("scsi", VirtIOBlock, host_features,
|
||||||
|
VIRTIO_BLK_F_SCSI, false),
|
||||||
#endif
|
#endif
|
||||||
DEFINE_PROP_BIT("request-merging", VirtIOBlock, conf.request_merging, 0,
|
DEFINE_PROP_BIT("request-merging", VirtIOBlock, conf.request_merging, 0,
|
||||||
true),
|
true),
|
||||||
|
|
|
@ -35,8 +35,6 @@ struct VirtIOBlkConf
|
||||||
BlockConf conf;
|
BlockConf conf;
|
||||||
IOThread *iothread;
|
IOThread *iothread;
|
||||||
char *serial;
|
char *serial;
|
||||||
uint32_t scsi;
|
|
||||||
uint32_t config_wce;
|
|
||||||
uint32_t request_merging;
|
uint32_t request_merging;
|
||||||
uint16_t num_queues;
|
uint16_t num_queues;
|
||||||
uint16_t queue_size;
|
uint16_t queue_size;
|
||||||
|
@ -57,6 +55,7 @@ typedef struct VirtIOBlock {
|
||||||
bool dataplane_disabled;
|
bool dataplane_disabled;
|
||||||
bool dataplane_started;
|
bool dataplane_started;
|
||||||
struct VirtIOBlockDataPlane *dataplane;
|
struct VirtIOBlockDataPlane *dataplane;
|
||||||
|
uint64_t host_features;
|
||||||
} VirtIOBlock;
|
} VirtIOBlock;
|
||||||
|
|
||||||
typedef struct VirtIOBlockReq {
|
typedef struct VirtIOBlockReq {
|
||||||
|
|
Loading…
Reference in New Issue