From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753434AbbANR1n (ORCPT ); Wed, 14 Jan 2015 12:27:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58398 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753219AbbANR1l (ORCPT ); Wed, 14 Jan 2015 12:27:41 -0500 Date: Wed, 14 Jan 2015 19:27:32 +0200 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org Cc: Rusty Russell , cornelia.huck@de.ibm.com, virtualization@lists.linux-foundation.org Subject: [PATCH v3 03/16] virtio/blk: verify device has config space Message-ID: <1421256142-11512-4-git-send-email-mst@redhat.com> References: <1421256142-11512-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1421256142-11512-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some devices might not implement config space access (e.g. remoteproc used not to - before 3.9). virtio/blk needs config space access so make it fail gracefully if not there. Signed-off-by: Michael S. Tsirkin --- drivers/block/virtio_blk.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 7ef7c09..7164da8 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -575,6 +575,12 @@ static int virtblk_probe(struct virtio_device *vdev) u16 min_io_size; u8 physical_block_exp, alignment_offset; + if (!vdev->config->get) { + dev_err(&vdev->dev, "%s failure: config access disabled\n", + __func__); + return -EINVAL; + } + err = ida_simple_get(&vd_index_ida, 0, minor_to_index(1 << MINORBITS), GFP_KERNEL); if (err < 0) -- MST