From: Michael S. Tsirkin <mst@redhat.com>
Date: Mon, 27 Jul 2015 15:39:37 +0000 (+0300)
Subject: virtio: minor cleanup
X-Git-Tag: v2.4.0-rc3~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c147b5153e733a14fc65d2098e7036754c185ad1;p=thirdparty%2Fqemu.git

virtio: minor cleanup

There's no need for blk to set ANY_LAYOUT, it's
done by virtio core as necessary.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 44f9b8e4b59..1556c9cf5a2 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -736,7 +736,6 @@ static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features,
             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_clear_feature(&features, VIRTIO_F_ANY_LAYOUT);
         virtio_add_feature(&features, VIRTIO_BLK_F_SCSI);