From patchwork Thu Apr 19 02:39:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 153639 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 F3EDBB6F62 for ; Thu, 19 Apr 2012 13:34:41 +1000 (EST) Received: from localhost ([::1]:46562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKhIY-0004Aa-PR for incoming@patchwork.ozlabs.org; Wed, 18 Apr 2012 22:40:42 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58289) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKhIO-0003sW-El for qemu-devel@nongnu.org; Wed, 18 Apr 2012 22:40:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKhIL-0002ND-Qn for qemu-devel@nongnu.org; Wed, 18 Apr 2012 22:40:31 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:37241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKhIL-0002My-Mm for qemu-devel@nongnu.org; Wed, 18 Apr 2012 22:40:29 -0400 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 18 Apr 2012 22:40:27 -0400 Received: from d01dlp01.pok.ibm.com (9.56.224.56) by e8.ny.us.ibm.com (192.168.1.108) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 18 Apr 2012 22:40:19 -0400 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 3164338C803A for ; Wed, 18 Apr 2012 22:40:19 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q3J2eITM2978020 for ; Wed, 18 Apr 2012 22:40:18 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q3J8BAZP001628 for ; Thu, 19 Apr 2012 04:11:11 -0400 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q3J8B5E2001467; Thu, 19 Apr 2012 04:11:06 -0400 Received: by us.ibm.com (sSMTP sendmail emulation); Thu, 19 Apr 2012 10:40:11 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Thu, 19 Apr 2012 10:39:05 +0800 Message-Id: <1334803149-27379-13-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-9360-0000-0000-0000058A46DA X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.182.138 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 12/16] virtio-scsi: use the vhost-scsi host device 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 The vhost-scsi code was originally part of the virtio-scsi emulation. This code has since been factored out and should be used instead. Signed-off-by: Stefan Hajnoczi Signed-off-by: Zhi Yong Wu --- hw/virtio-pci.c | 2 ++ hw/virtio-scsi.c | 10 +++------- hw/virtio-scsi.h | 4 +--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 025a518..107cc2d 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -984,6 +984,8 @@ static int virtio_scsi_exit_pci(PCIDevice *pci_dev) } static Property virtio_scsi_properties[] = { + DEFINE_PROP_VHOST_SCSI("vhost-scsi", VirtIOPCIProxy, + scsi.vhost_scsi), DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2), DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOPCIProxy, host_features, scsi), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c index 85170d3..e38cdd0 100644 --- a/hw/virtio-scsi.c +++ b/hw/virtio-scsi.c @@ -15,6 +15,7 @@ #include "qemu-common.h" #include "qemu-error.h" +#include "vhost-scsi.h" #include "virtio-scsi.h" #include #include @@ -602,11 +603,7 @@ static void virtio_scsi_set_status(VirtIODevice *vdev, uint8_t val) if (start) { int ret; - if (!vhost_dev_query(&s->vhost_scsi, vdev)) { - return; - } - - ret = virtio_scsi_vhost_start(s); + ret = vhost_scsi_start(s->vhost_scsi, vdev); if (ret < 0) { error_report("virtio-scsi: unable to start vhost: %s\n", strerror(-ret)); @@ -615,7 +612,7 @@ static void virtio_scsi_set_status(VirtIODevice *vdev, uint8_t val) exit(1); } } else { - virtio_scsi_vhost_stop(s); + vhost_scsi_stop(s->vhost_scsi, vdev); } s->vhost_started = start; @@ -670,6 +667,5 @@ void virtio_scsi_exit(VirtIODevice *vdev) /* This will stop vhost backend if appropriate. */ virtio_scsi_set_status(vdev, 0); - vhost_dev_cleanup(&s->vhost_scsi); virtio_cleanup(vdev); } diff --git a/hw/virtio-scsi.h b/hw/virtio-scsi.h index f66d12c..5f5f8c3 100644 --- a/hw/virtio-scsi.h +++ b/hw/virtio-scsi.h @@ -40,9 +40,7 @@ struct vhost_vring_target { }; typedef struct { - /* The tcm_vhost wwpn and tpgt */ - char *wwpn; - uint16_t tpgt; + VHostSCSI *vhost_scsi; } VirtIOSCSIConf; #endif /* _QEMU_VIRTIO_SCSI_H */