From patchwork Tue Jul 24 01:30:09 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: 1229891 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 1A756DFFBF for ; Tue, 24 Jul 2012 01:33:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755170Ab2GXBdP (ORCPT ); Mon, 23 Jul 2012 21:33:15 -0400 Received: from mail.linux-iscsi.org ([67.23.28.174]:54790 "EHLO linux-iscsi.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755162Ab2GXBdM (ORCPT ); Mon, 23 Jul 2012 21:33:12 -0400 Received: from linux-iscsi.org (localhost [127.0.0.1]) by linux-iscsi.org (Postfix) with ESMTP id 5914522D9DA; Tue, 24 Jul 2012 01:30:12 +0000 (UTC) From: "Nicholas A. Bellinger" To: target-devel Cc: lf-virt , kvm-devel , qemu-devel , Stefan Hajnoczi , Zhi Yong Wu , Anthony Liguori , Paolo Bonzini , "Michael S. Tsirkin" , Christoph Hellwig , Jens Axboe , Hannes Reinecke , Nicholas Bellinger , Anthony Liguori , Zhi Yong Wu Subject: [PATCH 1/2] vhost-scsi: Rename vhost_vring_target -> vhost_scsi_target Date: Tue, 24 Jul 2012 01:30:09 +0000 Message-Id: <1343093410-5843-2-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1343093410-5843-1-git-send-email-nab@linux-iscsi.org> References: <1343093410-5843-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 Rename the main IOCTL structure to vhost_scsi_target so that it makes a little more sense than vhost_vring_target. As requested by MST. Reported-by: Michael S. Tsirkin Cc: Stefan Hajnoczi Cc: Anthony Liguori Cc: Paolo Bonzini Cc: Zhi Yong Wu Signed-off-by: Nicholas Bellinger --- hw/vhost-scsi.c | 4 ++-- hw/vhost-scsi.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/vhost-scsi.c b/hw/vhost-scsi.c index 3e3378a..3e9fa0e 100644 --- a/hw/vhost-scsi.c +++ b/hw/vhost-scsi.c @@ -49,7 +49,7 @@ const char *vhost_scsi_get_id(VHostSCSI *vs) int vhost_scsi_start(VHostSCSI *vs, VirtIODevice *vdev) { int ret; - struct vhost_vring_target backend; + struct vhost_scsi_target backend; if (!vhost_dev_query(&vs->dev, vdev)) { return -ENOTSUP; @@ -86,7 +86,7 @@ void vhost_scsi_stop(VHostSCSI *vs, VirtIODevice *vdev) fprintf(stderr, "vhost_scsi_stop\n"); int ret; - struct vhost_vring_target backend; + struct vhost_scsi_target backend; pstrcpy((char *)backend.vhost_wwpn, sizeof(backend.vhost_wwpn), vs->wwpn); backend.vhost_tpgt = vs->tpgt; diff --git a/hw/vhost-scsi.h b/hw/vhost-scsi.h index 84e9097..8ce974a 100644 --- a/hw/vhost-scsi.h +++ b/hw/vhost-scsi.h @@ -19,14 +19,14 @@ /* TODO #include properly */ /* For VHOST_SCSI_SET_ENDPOINT/VHOST_SCSI_CLEAR_ENDPOINT ioctl */ -struct vhost_vring_target { +struct vhost_scsi_target { unsigned char vhost_wwpn[224]; unsigned short vhost_tpgt; }; #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) +#define VHOST_SCSI_SET_ENDPOINT _IOW(VHOST_VIRTIO, 0x40, struct vhost_scsi_target) +#define VHOST_SCSI_CLEAR_ENDPOINT _IOW(VHOST_VIRTIO, 0x41, struct vhost_scsi_target) VHostSCSI *find_vhost_scsi(const char *id); const char *vhost_scsi_get_id(VHostSCSI *vs);