summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2015-07-27 17:49:20 +0800
committerMichael S. Tsirkin <mst@redhat.com>2015-07-27 18:11:53 +0300
commitefb8206ca7f19f5a6ece1f2851a73a29de309b1e (patch)
tree092d92ff2f2db1237da8e044acea01e5f7e547b7 /hw
parent9d5b731dd2d64deb3bc798ef4e3c08603d54ae02 (diff)
downloadhqemu-efb8206ca7f19f5a6ece1f2851a73a29de309b1e.zip
hqemu-efb8206ca7f19f5a6ece1f2851a73a29de309b1e.tar.gz
virtio-blk: fail get_features when both scsi and 1.0 were set
SCSI passthrough was no longer supported in virtio 1.0, so this patch fail the get_features() when both 1.0 and scsi is set. And also only advertise VIRTIO_BLK_F_SCSI for legacy virtio-blk device. Signed-off-by: Jason Wang <jasowang@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/block/virtio-blk.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index a6cf008..ebd9d84 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -731,8 +731,16 @@ static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features,
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);
- virtio_add_feature(&features, VIRTIO_BLK_F_SCSI);
virtio_clear_feature(&features, VIRTIO_F_ANY_LAYOUT);
+ if (__virtio_has_feature(features, VIRTIO_F_VERSION_1)) {
+ if (s->conf.scsi) {
+ error_setg(errp, "Please set scsi=off for virtio-blk devices in order to use virtio 1.0");
+ return 0;
+ }
+ virtio_add_feature(&features, VIRTIO_F_ANY_LAYOUT);
+ } else {
+ virtio_add_feature(&features, VIRTIO_BLK_F_SCSI);
+ }
if (s->conf.config_wce) {
virtio_add_feature(&features, VIRTIO_BLK_F_CONFIG_WCE);
OpenPOWER on IntegriCloud