virtio-blk: only clear VIRTIO_F_ANY_LAYOUT for legacy device
Chapter 6.3 of spec said " Transitional devices MUST offer, and if offered by the device transitional drivers MUST accept the following: VIRTIO_F_ANY_LAYOUT (27) " So this patch only clear VIRTIO_F_LAYOUT for legacy device. Cc: Stefan Hajnoczi <stefanha@redhat.com> Cc: Kevin Wolf <kwolf@redhat.com> Cc: qemu-block@nongnu.org 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>
This commit is contained in:
parent
efb8206ca7
commit
c9b11f971c
|
@ -731,7 +731,6 @@ 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_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);
|
||||||
virtio_clear_feature(&features, VIRTIO_F_ANY_LAYOUT);
|
|
||||||
if (__virtio_has_feature(features, VIRTIO_F_VERSION_1)) {
|
if (__virtio_has_feature(features, VIRTIO_F_VERSION_1)) {
|
||||||
if (s->conf.scsi) {
|
if (s->conf.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");
|
||||||
|
@ -739,6 +738,7 @@ static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features,
|
||||||
}
|
}
|
||||||
virtio_add_feature(&features, VIRTIO_F_ANY_LAYOUT);
|
virtio_add_feature(&features, VIRTIO_F_ANY_LAYOUT);
|
||||||
} else {
|
} else {
|
||||||
|
virtio_clear_feature(&features, VIRTIO_F_ANY_LAYOUT);
|
||||||
virtio_add_feature(&features, VIRTIO_BLK_F_SCSI);
|
virtio_add_feature(&features, VIRTIO_BLK_F_SCSI);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue