[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/10] virtio-blk: only clear VIRTIO_F_ANY_LAYOUT for
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 08/10] virtio-blk: only clear VIRTIO_F_ANY_LAYOUT for legacy device |
Date: |
Tue, 28 Jul 2015 12:57:55 +0300 |
From: Jason Wang <address@hidden>
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 <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: address@hidden
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
---
hw/block/virtio-blk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index ebd9d84..44f9b8e 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -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_TOPOLOGY);
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 (s->conf.scsi) {
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);
} else {
+ virtio_clear_feature(&features, VIRTIO_F_ANY_LAYOUT);
virtio_add_feature(&features, VIRTIO_BLK_F_SCSI);
}
--
MST
- [Qemu-devel] [PULL 00/10] virtio fixes for 2.4, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 02/10] virtio-serial: fix ANY_LAYOUT, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 01/10] virtio: hide legacy features from modern guests, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 03/10] virtio-9p: fix any_layout, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 05/10] virtio-pci: fix memory MR cleanup for modern, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 04/10] virtio: set any_layout in virtio core, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 07/10] virtio-blk: fail get_features when both scsi and 1.0 were set, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 06/10] virtio: get_features() can fail, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 08/10] virtio-blk: only clear VIRTIO_F_ANY_LAYOUT for legacy device,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 09/10] acpi: fix pvpanic device is not shown in ui, Michael S. Tsirkin, 2015/07/28
- [Qemu-devel] [PULL 10/10] virtio: minor cleanup, Michael S. Tsirkin, 2015/07/28
- Re: [Qemu-devel] [PULL 00/10] virtio fixes for 2.4, Cornelia Huck, 2015/07/28
- Re: [Qemu-devel] [PULL 00/10] virtio fixes for 2.4, Peter Maydell, 2015/07/28