From patchwork Sat May 15 13:30:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nicholas A. Bellinger" X-Patchwork-Id: 99796 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4F57eGc002795 for ; Sat, 15 May 2010 05:07:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751451Ab0EOFHg (ORCPT ); Sat, 15 May 2010 01:07:36 -0400 Received: from smtp110.sbc.mail.gq1.yahoo.com ([67.195.14.95]:41440 "HELO smtp110.sbc.mail.gq1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751281Ab0EOFHf (ORCPT ); Sat, 15 May 2010 01:07:35 -0400 Received: (qmail 38676 invoked from network); 15 May 2010 05:07:34 -0000 Received: from adsl-70-231-246-220.dsl.snfc21.sbcglobal.net (nab@70.231.246.220 with login) by smtp110.sbc.mail.gq1.yahoo.com with SMTP; 14 May 2010 22:07:34 -0700 PDT X-Yahoo-SMTP: fzDSGlOswBCWnIOrNw7KwwK1j9PqyNbe5PtLKiS4dDU.UNl_t6bdEZu9tTLW X-YMail-OSG: YjhZIjEVM1k1YbLvdxK21GV5t9w.X_kMRmPHOC0uh9Q8jtCm_C3lWBG2palwIYNGEPC2.IOnSKU0CEoiuSMlxp0wCzLFZU0BdcVRdR17QywUIiJihP2StRRuNEFzy_YV04R0VveGRAPmieapf2c.M04_MFiw87w7neUMulF2FAgjOyi9mGiySKDYW3mE5dAXpnljsc1vVX8AdWq28x73u6MkhDqsfj1WQ8ecmzTknKu4J.IYbKde4XNhuwOyKet_w9JJAqbXqCQmbFwfVkhnIqSZKQYvKoVwZu595MbXmb.7At_8s8auQJ.bucaZT3kuxtb8J3k_TTcoX2B_VpaDoHzUGHJAURofQaAXnT9edSd71w-- X-Yahoo-Newman-Property: ymail-3 From: "Nicholas A. Bellinger" To: Kevin Wolf , Christoph Hellwig , Gerd Hoffmann , Hannes Reinecke , kvm-devel , qemu-devel Cc: Nicholas Bellinger Subject: [PATCH 1/2] [block]: Fix scsi-generic breakage in find_image_format() Date: Sat, 15 May 2010 06:30:52 -0700 Message-Id: <1273930252-12673-1-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.5.6.5 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 15 May 2010 05:07:41 +0000 (UTC) diff --git a/block.c b/block.c index 48305b7..02a22f6 100644 --- a/block.c +++ b/block.c @@ -332,6 +332,13 @@ static BlockDriver *find_image_format(const char *filename) ret = bdrv_file_open(&bs, filename, 0); if (ret < 0) return NULL; + /* + * For scsi-generic we skip the read and return *drv from + * find_protocol(). + */ + if (bs->sg) + return drv; + ret = bdrv_pread(bs, 0, buf, sizeof(buf)); bdrv_delete(bs); if (ret < 0) {