[PATCH 1/2] vhost-scsi: Rename vhost_vring_target -> vhost_scsi_target
From: Nicholas A. Bellinger <hidden>
Date: 2012-07-24 01:33:17
Also in:
kvm, qemu-devel
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Nicholas Bellinger <redacted> 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 <mst@redhat.com> Cc: Stefan Hajnoczi <redacted> Cc: Anthony Liguori <redacted> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Zhi Yong Wu <redacted> Signed-off-by: Nicholas Bellinger <redacted> --- 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 <linux/vhost.h> 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);
--
1.7.2.5