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: 52700 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D0251B7E02 for ; Sat, 15 May 2010 15:10:45 +1000 (EST) Received: from localhost ([127.0.0.1]:36194 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OD9e6-0000Q3-7t for incoming@patchwork.ozlabs.org; Sat, 15 May 2010 01:10:42 -0400 Received: from [140.186.70.92] (port=42418 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OD9b7-0007rX-CH for qemu-devel@nongnu.org; Sat, 15 May 2010 01:07:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OD9b5-0008GM-Vw for qemu-devel@nongnu.org; Sat, 15 May 2010 01:07:37 -0400 Received: from smtp110.sbc.mail.gq1.yahoo.com ([67.195.14.95]:41441) by eggs.gnu.org with smtp (Exim 4.69) (envelope-from ) id 1OD9b5-0008GI-M4 for qemu-devel@nongnu.org; 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 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 X-detected-operating-system: by eggs.gnu.org: FreeBSD 6.x (1) Cc: Nicholas Bellinger Subject: [Qemu-devel] [PATCH 1/2] [block]: Fix scsi-generic breakage in find_image_format() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Nicholas Bellinger This patch adds a special BlockDriverState->sg check in block.c:find_image_format() after bdrv_file_open() -> block/raw-posix.c:hdev_open() has been called to determine if we are dealing with a Linux host scsi-generic device or not. The patch then returns the BlockDriver * from find_protocol(), skipping the subsequent bdrv_read() and rest of find_image_format(). Signed-off-by: Nicholas A. Bellinger --- block.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) 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) {