From patchwork Tue Jul 28 09:58:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 501122 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5E60F14016A for ; Tue, 28 Jul 2015 20:04:54 +1000 (AEST) Received: from localhost ([::1]:57805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK1ki-0006Uv-IA for incoming@patchwork.ozlabs.org; Tue, 28 Jul 2015 06:04:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK1eC-0003LM-Ex for qemu-devel@nongnu.org; Tue, 28 Jul 2015 05:58:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZK1eB-0002IN-Ew for qemu-devel@nongnu.org; Tue, 28 Jul 2015 05:58:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK1e9-0002H6-K2; Tue, 28 Jul 2015 05:58:05 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 2BD0E96C8; Tue, 28 Jul 2015 09:58:05 +0000 (UTC) Received: from redhat.com (ovpn-116-118.ams2.redhat.com [10.36.116.118]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id t6S9w2w0010143; Tue, 28 Jul 2015 05:58:03 -0400 Date: Tue, 28 Jul 2015 12:58:02 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1438077261-16651-11-git-send-email-mst@redhat.com> References: <1438077261-16651-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1438077261-16651-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PULL 10/10] virtio: minor cleanup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org There's no need for blk to set ANY_LAYOUT, it's done by virtio core as necessary. Signed-off-by: Michael S. Tsirkin --- hw/block/virtio-blk.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 44f9b8e..1556c9c 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);