summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStefano Garzarella2019-02-21 11:33:06 +0100
committerStefan Hajnoczi2019-02-22 10:42:16 +0100
commitbbe8bd4d85d80442f87774d7bffaca11f2c02b9b (patch)
tree46d354fd1d29ce5f3299a702dcd6937135527deb /include
parentvirtio-blk: add acct_failed param to virtio_blk_handle_rw_error() (diff)
downloadqemu-bbe8bd4d85d80442f87774d7bffaca11f2c02b9b.tar.gz
qemu-bbe8bd4d85d80442f87774d7bffaca11f2c02b9b.tar.xz
qemu-bbe8bd4d85d80442f87774d7bffaca11f2c02b9b.zip
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>
Diffstat (limited to 'include')
-rw-r--r--include/hw/virtio/virtio-blk.h3
1 files changed, 1 insertions, 2 deletions
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 {