From patchwork Fri Aug 31 00:28:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ronnie sahlberg X-Patchwork-Id: 180885 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 4E16B2C0322 for ; Fri, 31 Aug 2012 10:29:06 +1000 (EST) Received: from localhost ([::1]:53044 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7F6e-0005dZ-9q for incoming@patchwork.ozlabs.org; Thu, 30 Aug 2012 20:29:04 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46732) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7F6R-0005X9-Oz for qemu-devel@nongnu.org; Thu, 30 Aug 2012 20:28:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T7F6Q-00061K-KI for qemu-devel@nongnu.org; Thu, 30 Aug 2012 20:28:51 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:61881) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7F6Q-00060K-Dv for qemu-devel@nongnu.org; Thu, 30 Aug 2012 20:28:50 -0400 Received: by mail-pb0-f45.google.com with SMTP id jt11so3960024pbb.4 for ; Thu, 30 Aug 2012 17:28:50 -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=FxZjVaQ6WKXDBIL/Sy0WYJCaQ2Tnf8zaRqeDpHHlfKQ=; b=J4MS+6ZfyyRZr+Yoqm6iMHWqdkAxuIECNggKJk6LK3EIpgcw9PudMfoAbTh+AmczkC UlbHMHWB4Deb8PKz6ofCz8Cj12IrUkkAaymjYkiunJeNLLifGf4f4asVO6G4k9rFEulS oSvibDmKugUJEjKKI8/k1K36BnX7TEosStxqqmj3xYdrkB4V9Qc34HhQuZ22C4bhNatu wIvlsKX8Clbl3BNvrLK6YaOyWuWLZMubp8oxxJ615sY2ly8e9qHw12w0+5+Xv58ZZzrZ xNYRW0uUovfvRAJWzArHIQSJUsu+UBXm/URiOHEWssdqMuwAL0g/cvikje2zpWs6F794 Zv7Q== Received: by 10.68.231.130 with SMTP id tg2mr14348606pbc.70.1346372930005; Thu, 30 Aug 2012 17:28:50 -0700 (PDT) Received: from ronniesahlberg@gmail.com (c-71-202-165-15.hsd1.ca.comcast.net. [71.202.165.15]) by mx.google.com with ESMTPS id uu6sm2412964pbc.70.2012.08.30.17.28.47 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 30 Aug 2012 17:28:49 -0700 (PDT) Received: by ronniesahlberg@gmail.com (sSMTP sendmail emulation); Thu, 30 Aug 2012 17:28:46 -0700 From: Ronnie Sahlberg To: pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 30 Aug 2012 17:28:40 -0700 Message-Id: <1346372920-10459-2-git-send-email-ronniesahlberg@gmail.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1346372920-10459-1-git-send-email-ronniesahlberg@gmail.com> References: <1346372920-10459-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] iSCSI: We need to support SG_IO also from iscsi_ioctl() 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 We need to support SG_IO from the synchronous iscsi_ioctl() since scsi-block uses this to do an INQ to the device to discover its properties This patch makes scsi-block work with iscsi. Signed-off-by: Ronnie Sahlberg --- block/iscsi.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 355ce65..189ab6f 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -537,7 +537,8 @@ iscsi_aio_ioctl_cb(struct iscsi_context *iscsi, int status, #define SG_ERR_DRIVER_SENSE 0x08 - if (status == SCSI_STATUS_CHECK_CONDITION && acb->task->datain.size >= 2) { + if (status == SCSI_STATUS_CHECK_CONDITION + && acb->task->datain.size >= 2) { int ss; acb->ioh->driver_status |= SG_ERR_DRIVER_SENSE; @@ -622,9 +623,17 @@ static BlockDriverAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, return &acb->common; } + +static void ioctl_cb(void *opaque, int status) +{ + int *p_status = opaque; + *p_status = status; +} + static int iscsi_ioctl(BlockDriverState *bs, unsigned long int req, void *buf) { IscsiLun *iscsilun = bs->opaque; + int status; switch (req) { case SG_GET_VERSION_NUM: @@ -633,6 +642,15 @@ static int iscsi_ioctl(BlockDriverState *bs, unsigned long int req, void *buf) case SG_GET_SCSI_ID: ((struct sg_scsi_id *)buf)->scsi_type = iscsilun->type; break; + case SG_IO: + status = -EINPROGRESS; + iscsi_aio_ioctl(bs, req, buf, ioctl_cb, &status); + + while (status == -EINPROGRESS) { + qemu_aio_wait(); + } + + return 0; default: return -1; }