From patchwork Fri Sep 21 14:52:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 185800 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 7CF132C0086 for ; Sat, 22 Sep 2012 01:50:26 +1000 (EST) Received: from localhost ([::1]:59417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF4cP-0007gy-9w for incoming@patchwork.ozlabs.org; Fri, 21 Sep 2012 10:54:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF4bg-0005jW-31 for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:53:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF4bU-0008Vi-Tm for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:53:28 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:42967) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF4bU-0008VW-Mz for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:53:16 -0400 Received: by padfb10 with SMTP id fb10so467877pad.4 for ; Fri, 21 Sep 2012 07:53:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=fxQgx642NKtmxkjcaeaJTdEtKJ1Tu+v4EHvx9pFJZIA=; b=0Q86loJ+DEtGy2XaPVfecVPai8Oi1wrtHUYSureDNM6YUjuSqaOS1BLavc2Y++AQj+ vHCpimnGF5YUp6HmtwhYzDcebw0S7LjQJR/i3DFlsASyR0TplYmmyXVnKN8ME8qTUsSf At+7U6pkEQvExMrd0dmlqnc1YmvLSmx6z5xvNq+uejnAcg+gnCKzyOD6+v3jxYWFn+hd YqIr4ikkggOltOuLdIRr6giw/zlCSJQe8XePr0v9ecefwx8jv7vTpMI6HTeSPAoLqKF1 7kBsPfjnKENV1MWvQcP84oO/uANrdUIhWHxgcDXhHOnkFpH3zFnaAIwiMdBlCBi9xoay W4Vg== Received: by 10.68.218.196 with SMTP id pi4mr16044201pbc.128.1348239195765; Fri, 21 Sep 2012 07:53:15 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id tw5sm5236070pbc.48.2012.09.21.07.53.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Sep 2012 07:53:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 21 Sep 2012 16:52:43 +0200 Message-Id: <1348239169-25040-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1348239169-25040-1-git-send-email-pbonzini@redhat.com> References: <1348239169-25040-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Cc: aliguori@us.ibm.com, Ronnie Sahlberg Subject: [Qemu-devel] [PATCH 1/7] 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 From: Ronnie Sahlberg 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 Signed-off-by: Paolo Bonzini --- block/iscsi.c | 17 +++++++++++++++++ 1 file modificato, 17 inserzioni(+) diff --git a/block/iscsi.c b/block/iscsi.c index 0b96165..ea16609 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -628,9 +628,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: @@ -639,6 +647,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; }