From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 21 Sep 2012 16:52:43 +0200 Message-Id: <1348239169-25040-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1348239169-25040-1-git-send-email-pbonzini@redhat.com> References: <1348239169-25040-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/7] iSCSI: We need to support SG_IO also from iscsi_ioctl() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, Ronnie Sahlberg 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; } -- 1.7.12