From patchwork Sat May 26 04:56:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ronnie sahlberg X-Patchwork-Id: 161446 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 50DF2B6F6E for ; Sat, 26 May 2012 15:10:15 +1000 (EST) Received: from localhost ([::1]:50685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY9GW-0002uH-Vc for incoming@patchwork.ozlabs.org; Sat, 26 May 2012 01:10:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY9GF-0002QR-8T for qemu-devel@nongnu.org; Sat, 26 May 2012 01:09:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SY9GD-0007cU-CD for qemu-devel@nongnu.org; Sat, 26 May 2012 01:09:54 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:58578) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY9GD-0007Zv-38 for qemu-devel@nongnu.org; Sat, 26 May 2012 01:09:53 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so2858225pbb.4 for ; Fri, 25 May 2012 22:09:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=LjFELsv4npiul/gKHlC7BI407B29poy/+bK49tr7xkU=; b=SrHUt3hnYuEvlYQTX40QkdA46TPRHT6XFzMNZft+2eHKpaBUM9WSheWeVdepbt5LqH zxL7vA+CU+/1GBpnHto+W3q6eQuSfGKhu4ItyCeDAAeCdW13rPoOh57EMJVUtKTFKl2j hbezJgOcZ+AfcLhGMCQuNcurKCiLfkaf+A613KM2PqH87eVCCXSyHcoLaOyFOApqRRPL un4z9CRws/xKYWHKv3CgMsII4JWs4xEj3spRPUKq/T2aP0aVXmYLwm9Ml74y7Kb8YErO ZejcWYIwS7IIaFm41XE8/LsYHtYvRukSavHLPM0nwWDCWAYMNcsPXazhEWvP3SuKp+Hg 2fAg== Received: by 10.68.197.166 with SMTP id iv6mr4400717pbc.40.1338008992206; Fri, 25 May 2012 22:09:52 -0700 (PDT) Received: from ronniesahlberg@gmail.com (CPE-138-130-106-226.lns3.cht.bigpond.net.au. [138.130.106.226]) by mx.google.com with ESMTPS id tk1sm3717783pbc.8.2012.05.25.22.09.48 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 May 2012 22:09:51 -0700 (PDT) Received: by ronniesahlberg@gmail.com (sSMTP sendmail emulation); Sat, 26 May 2012 14:56:53 +1000 From: Ronnie Sahlberg To: pbonzini@redhat.com, qemu-devel@nongnu.org Date: Sat, 26 May 2012 14:56:38 +1000 Message-Id: <1338008201-29078-2-git-send-email-ronniesahlberg@gmail.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1338008201-29078-1-git-send-email-ronniesahlberg@gmail.com> References: <1338008201-29078-1-git-send-email-ronniesahlberg@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Ronnie Sahlberg Subject: [Qemu-devel] [PATCH 1/4] ISCSI: Only call READCAPACITY16 for SBC devices 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 Signed-off-by: Ronnie Sahlberg --- block/iscsi.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index df0b6c8..39d75cb 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -727,13 +727,20 @@ iscsi_inquiry_cb(struct iscsi_context *iscsi, int status, void *command_data, scsi_free_scsi_task(task); - task = iscsi_readcapacity16_task(iscsi, itask->iscsilun->lun, + switch (itask->iscsilun->type) { + case TYPE_DISK: + task = iscsi_readcapacity16_task(iscsi, itask->iscsilun->lun, iscsi_readcapacity16_cb, opaque); - if (task == NULL) { - error_report("iSCSI: failed to send readcapacity16 command."); - itask->status = 1; + if (task == NULL) { + error_report("iSCSI: failed to send readcapacity16 command."); + itask->status = 1; + itask->complete = 1; + return; + } + break; + default: + itask->status = 0; itask->complete = 1; - return; } }