[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/27] vhost-user-scsi: rename VUS types
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 18/27] vhost-user-scsi: rename VUS types |
Date: |
Wed, 23 Aug 2017 18:19:55 +0200 |
- use Vus prefix consistently
- use CamelCase, since that's glib & libvhost-user style
- avoid _t postfix, usually for system headers
Signed-off-by: Marc-André Lureau <address@hidden>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 46 +++++++++++++++----------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c
b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 882d887a32..2ceca964f4 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -55,18 +55,18 @@
#define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi"
-typedef struct iscsi_lun {
+typedef struct VusIscsiLun {
struct iscsi_context *iscsi_ctx;
int iscsi_lun;
-} iscsi_lun_t;
+} VusIscsiLun;
-typedef struct vhost_scsi_dev {
+typedef struct VusDev {
VuDev vu_dev;
int server_sock;
GMainLoop *loop;
GTree *fdmap; /* fd -> gsource context id */
- iscsi_lun_t lun;
-} vhost_scsi_dev_t;
+ VusIscsiLun lun;
+} VusDev;
/** glib event loop integration for libvhost-user and misc callbacks **/
@@ -78,7 +78,7 @@ QEMU_BUILD_BUG_ON((int)G_IO_HUP != (int)VU_WATCH_HUP);
typedef struct vus_gsrc {
GSource parent;
- vhost_scsi_dev_t *vdev_scsi;
+ VusDev *vdev_scsi;
GPollFD gfd;
vu_watch_cb vu_cb;
} vus_gsrc_t;
@@ -107,7 +107,7 @@ static gboolean vus_gsrc_check(GSource *src)
static gboolean vus_gsrc_dispatch(GSource *src, GSourceFunc cb, gpointer data)
{
- vhost_scsi_dev_t *vdev_scsi;
+ VusDev *vdev_scsi;
vus_gsrc_t *vus_src = (vus_gsrc_t *)src;
assert(vus_src);
@@ -133,7 +133,7 @@ static GSourceFuncs vus_gsrc_funcs = {
NULL
};
-static void vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition
cond,
+static void vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,
vu_watch_cb vu_cb, gpointer data)
{
GSource *vus_gsrc;
@@ -245,7 +245,7 @@ struct scsi_task {
/** libiscsi integration **/
-static int iscsi_add_lun(iscsi_lun_t *lun, char *iscsi_uri)
+static int iscsi_add_lun(VusIscsiLun *lun, char *iscsi_uri)
{
struct iscsi_url *iscsi_url;
struct iscsi_context *iscsi_ctx;
@@ -415,11 +415,11 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
static void vus_panic_cb(VuDev *vu_dev, const char *buf)
{
- vhost_scsi_dev_t *vdev_scsi;
+ VusDev *vdev_scsi;
assert(vu_dev);
- vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
+ vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
if (buf) {
PERR("vu_panic: %s", buf);
}
@@ -430,14 +430,14 @@ static void vus_panic_cb(VuDev *vu_dev, const char *buf)
static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,
void *pvt)
{
- vhost_scsi_dev_t *vdev_scsi;
+ VusDev *vdev_scsi;
guint id;
assert(vu_dev);
assert(fd >= 0);
assert(cb);
- vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
+ vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,
(gpointer)(uintptr_t)fd);
if (id) {
@@ -452,13 +452,13 @@ static void vus_add_watch_cb(VuDev *vu_dev, int fd, int
vu_evt, vu_watch_cb cb,
static void vus_del_watch_cb(VuDev *vu_dev, int fd)
{
- vhost_scsi_dev_t *vdev_scsi;
+ VusDev *vdev_scsi;
guint id;
assert(vu_dev);
assert(fd >= 0);
- vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
+ vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,
(gpointer)(uintptr_t)fd);
if (id) {
@@ -471,12 +471,12 @@ static void vus_del_watch_cb(VuDev *vu_dev, int fd)
static void vus_proc_req(VuDev *vu_dev, int idx)
{
- vhost_scsi_dev_t *vdev_scsi;
+ VusDev *vdev_scsi;
VuVirtq *vq;
assert(vu_dev);
- vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
+ vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {
PERR("VQ Index out of range: %d", idx);
vus_panic_cb(vu_dev, NULL);
@@ -617,7 +617,7 @@ fail:
/** vhost-user-scsi **/
-static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)
+static void vdev_scsi_free(VusDev *vdev_scsi)
{
if (vdev_scsi->server_sock >= 0) {
close(vdev_scsi->server_sock);
@@ -627,13 +627,13 @@ static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)
g_free(vdev_scsi);
}
-static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)
+static VusDev *vdev_scsi_new(int server_sock)
{
- vhost_scsi_dev_t *vdev_scsi;
+ VusDev *vdev_scsi;
assert(server_sock >= 0);
- vdev_scsi = g_new0(vhost_scsi_dev_t, 1);
+ vdev_scsi = g_new0(VusDev, 1);
vdev_scsi->server_sock = server_sock;
vdev_scsi->loop = g_main_loop_new(NULL, FALSE);
vdev_scsi->fdmap = g_tree_new(vus_fdmap_compare);
@@ -641,7 +641,7 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)
return vdev_scsi;
}
-static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi)
+static int vdev_scsi_run(VusDev *vdev_scsi)
{
GIOChannel *chan;
int cli_sock;
@@ -676,7 +676,7 @@ static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi)
int main(int argc, char **argv)
{
- vhost_scsi_dev_t *vdev_scsi = NULL;
+ VusDev *vdev_scsi = NULL;
char *unix_fn = NULL;
char *iscsi_uri = NULL;
int sock, opt, err = EXIT_SUCCESS;
--
2.14.1.146.gd35faa819
- [Qemu-devel] [PATCH 12/27] vhost-user-scsi: use NULL pointer, (continued)
- [Qemu-devel] [PATCH 12/27] vhost-user-scsi: use NULL pointer, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 13/27] vhost-user-scsi: use glib watch directly, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 14/27] vhost-user-scsi: assert() in iscsi_add_lun(), Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 15/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun(), Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 17/27] vhost-user-scsi: remove unimplemented functions, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 16/27] vhost-user-scsi: remove VUS_MAX_LUNS, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 18/27] vhost-user-scsi: rename VUS types,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 19/27] vhost-user-scsi: avoid use of iscsi_ namespace, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 20/27] vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 21/27] vhost-user-scsi: drop extra callback pointer, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 22/27] vhost-user-scsi: simplify source handling, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 24/27] libvhost-user: add glib source helper, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 23/27] vhost-user-scsi: use glib logging, Marc-André Lureau, 2017/08/23