From patchwork Wed Jul 4 04:24:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nicholas A. Bellinger" X-Patchwork-Id: 1154051 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 213F540B04 for ; Wed, 4 Jul 2012 04:27:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752849Ab2GDE0y (ORCPT ); Wed, 4 Jul 2012 00:26:54 -0400 Received: from mail.linux-iscsi.org ([67.23.28.174]:33731 "EHLO linux-iscsi.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752231Ab2GDE0p (ORCPT ); Wed, 4 Jul 2012 00:26:45 -0400 Received: from linux-iscsi.org (localhost [127.0.0.1]) by linux-iscsi.org (Postfix) with ESMTP id B5C2E22D9DB; Wed, 4 Jul 2012 04:24:22 +0000 (UTC) From: "Nicholas A. Bellinger" To: target-devel Cc: linux-scsi , lf-virt , kvm-devel , Stefan Hajnoczi , Zhi Yong Wu , Anthony Liguori , Paolo Bonzini , "Michael S. Tsirkin" , Christoph Hellwig , Jens Axboe , Hannes Reinecke , Nicholas Bellinger Subject: [PATCH 3/6] vhost: Add vhost_scsi specific defines Date: Wed, 4 Jul 2012 04:24:03 +0000 Message-Id: <1341375846-27882-4-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1341375846-27882-1-git-send-email-nab@linux-iscsi.org> References: <1341375846-27882-1-git-send-email-nab@linux-iscsi.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Nicholas Bellinger This patch adds the initial vhost_scsi_ioctl() callers for VHOST_SCSI_SET_ENDPOINT and VHOST_SCSI_CLEAR_ENDPOINT respectively, and also adds struct vhost_vring_target that is used by tcm_vhost code when locating target ports during qemu setup. Signed-off-by: Stefan Hajnoczi Cc: Zhi Yong Wu Cc: Michael S. Tsirkin Cc: Paolo Bonzini , Signed-off-by: Nicholas A. Bellinger --- include/linux/vhost.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/linux/vhost.h b/include/linux/vhost.h index e847f1e..33b313b 100644 --- a/include/linux/vhost.h +++ b/include/linux/vhost.h @@ -24,7 +24,11 @@ struct vhost_vring_state { struct vhost_vring_file { unsigned int index; int fd; /* Pass -1 to unbind from file. */ +}; +struct vhost_vring_target { + unsigned char vhost_wwpn[224]; + unsigned short vhost_tpgt; }; struct vhost_vring_addr { @@ -121,6 +125,11 @@ struct vhost_memory { * device. This can be used to stop the ring (e.g. for migration). */ #define VHOST_NET_SET_BACKEND _IOW(VHOST_VIRTIO, 0x30, struct vhost_vring_file) +/* VHOST_SCSI specific defines */ + +#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) + /* Feature bits */ /* Log all write descriptors. Can be changed while device is active. */ #define VHOST_F_LOG_ALL 26