From patchwork Thu Apr 19 02:39:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 153628 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 49B77B6EF1 for ; Thu, 19 Apr 2012 12:50:15 +1000 (EST) Received: from localhost ([::1]:48068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKhIy-0004wG-PZ for incoming@patchwork.ozlabs.org; Wed, 18 Apr 2012 22:41:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKhIO-0003tf-Nf for qemu-devel@nongnu.org; Wed, 18 Apr 2012 22:40:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKhIL-0002NK-T7 for qemu-devel@nongnu.org; Wed, 18 Apr 2012 22:40:32 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:40097) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKhIL-0002Mx-NY for qemu-devel@nongnu.org; Wed, 18 Apr 2012 22:40:29 -0400 Received: from /spool/local by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 18 Apr 2012 20:40:28 -0600 Received: from d01dlp03.pok.ibm.com (9.56.224.17) by e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 18 Apr 2012 20:40:26 -0600 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id C7D18C90067 for ; Wed, 18 Apr 2012 22:40:23 -0400 (EDT) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q3J2ePmi306368 for ; Wed, 18 Apr 2012 22:40:25 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q3J2eOeD017652 for ; Wed, 18 Apr 2012 22:40:24 -0400 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q3J2eIoC016817; Wed, 18 Apr 2012 22:40:20 -0400 Received: by us.ibm.com (sSMTP sendmail emulation); Thu, 19 Apr 2012 10:40:17 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Thu, 19 Apr 2012 10:39:06 +0800 Message-Id: <1334803149-27379-14-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1334803149-27379-1-git-send-email-zwu.kernel@gmail.com> References: <1334803149-27379-1-git-send-email-zwu.kernel@gmail.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12041902-6148-0000-0000-00000526F217 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.153 Cc: stefanha@linux.vnet.ibm.com, linuxram@us.ibm.com, nab@linux-iscsi.org, zwu.kernel@gmail.com, Zhi Yong Wu , luowenj@cn.ibm.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 13/16] virtio-scsi: WIP VHOST_SCSI_SET_ENDPOINT call 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: Stefan Hajnoczi Current we get -EINVAL, need to debug this. Signed-off-by: Stefan Hajnoczi Signed-off-by: Zhi Yong Wu --- hw/vhost-scsi.c | 19 ++++++++++++++++++- hw/virtio-scsi.h | 11 +---------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/hw/vhost-scsi.c b/hw/vhost-scsi.c index 6e3645f..82e0a68 100644 --- a/hw/vhost-scsi.c +++ b/hw/vhost-scsi.c @@ -11,6 +11,7 @@ * */ +#include #include "config.h" #include "qemu-queue.h" #include "vhost-scsi.h" @@ -48,6 +49,14 @@ const char *vhost_scsi_get_id(VHostSCSI *vs) int vhost_scsi_start(VHostSCSI *vs, VirtIODevice *vdev) { int ret; + /* TODO #include properly */ + struct vhost_vring_target { + unsigned char vhost_wwpn[224]; + unsigned short vhost_tpgt; + } backend; +#define VHOST_VIRTIO 0xAF +#define VHOST_SCSI_SET_ENDPOINT _IOW(VHOST_VIRTIO, 0x40, struct vhost_vring_target) +#define VHOST_SCSI_CLEAR_ENDPOINT _IOW(VHOST_VIRTIO, 0x41, struct vhost_vring_target) if (!vhost_dev_query(&vs->dev, vdev)) { return -ENOTSUP; @@ -60,7 +69,15 @@ int vhost_scsi_start(VHostSCSI *vs, VirtIODevice *vdev) return ret; } - /* TODO set wwpn and tpgt */ + pstrcpy((char *)backend.vhost_wwpn, sizeof(backend.vhost_wwpn), vs->wwpn); + backend.vhost_tpgt = vs->tpgt; + ret = ioctl(vs->dev.control, VHOST_SCSI_SET_ENDPOINT, &backend); + if (ret < 0) { + ret = -errno; + vhost_dev_stop(&vs->dev, vdev); + return ret; + } + fprintf(stderr, "vhost_scsi_start\n"); return 0; } diff --git a/hw/virtio-scsi.h b/hw/virtio-scsi.h index 5f5f8c3..74e9422 100644 --- a/hw/virtio-scsi.h +++ b/hw/virtio-scsi.h @@ -22,6 +22,7 @@ #define VIRTIO_ID_SCSI 8 struct VirtIOSCSIConf { + VHostSCSI *vhost_scsi; uint32_t num_queues; uint32_t max_sectors; uint32_t cmd_per_lun; @@ -33,14 +34,4 @@ struct VirtIOSCSIConf { DEFINE_PROP_UINT32("max_sectors", _state, _conf_field.max_sectors, 0xFFFF), \ DEFINE_PROP_UINT32("cmd_per_lun", _state, _conf_field.cmd_per_lun, 128) -/* For VHOST_SCSI_SET_ENDPOINT/VHOST_SCSI_CLEAR_ENDPOINT ioctl */ -struct vhost_vring_target { - unsigned char vhost_wwpn[224]; - unsigned short vhost_tpgt; -}; - -typedef struct { - VHostSCSI *vhost_scsi; -} VirtIOSCSIConf; - #endif /* _QEMU_VIRTIO_SCSI_H */