From: John Ferlan <jferlan@redhat.com>
Date: Tue, 18 Jul 2017 13:51:08 +0000 (-0400)
Subject: storage: Remove @conn from virNodeDeviceCreateVport
X-Git-Tag: v3.6.0-rc1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=214a353c02ad99ac0e29dc21b7932da2e2392dc6;p=thirdparty%2Flibvirt.git

storage: Remove @conn from virNodeDeviceCreateVport

It's no longer needed since the checkParent code moved back to
storage_backend_scsi.c

Signed-off-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 9c0ffa561a..82f02fa6c8 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -2260,7 +2260,6 @@ virNodeDeviceGetParentName(virConnectPtr conn,
 
 
 /**
- * @conn: Connection pointer
  * @fchost: Pointer to vHBA adapter
  *
  * Create a vHBA for Storage. This code accomplishes this via searching
@@ -2273,16 +2272,15 @@ virNodeDeviceGetParentName(virConnectPtr conn,
  * Returns vHBA name on success, NULL on failure with an error message set
  */
 char *
-virNodeDeviceCreateVport(virConnectPtr conn,
-                         virStorageAdapterFCHostPtr fchost)
+virNodeDeviceCreateVport(virStorageAdapterFCHostPtr fchost)
 {
     unsigned int parent_host;
     char *name = NULL;
     char *parent_hoststr = NULL;
     bool skip_capable_check = false;
 
-    VIR_DEBUG("conn=%p, parent='%s', wwnn='%s' wwpn='%s'",
-              conn, NULLSTR(fchost->parent), fchost->wwnn, fchost->wwpn);
+    VIR_DEBUG("parent='%s', wwnn='%s' wwpn='%s'",
+              NULLSTR(fchost->parent), fchost->wwnn, fchost->wwpn);
 
     if (fchost->parent) {
         if (VIR_STRDUP(parent_hoststr, fchost->parent) < 0)
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index d10683d69e..da56eaffa4 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -384,8 +384,7 @@ virNodeDeviceGetParentName(virConnectPtr conn,
                            const char *nodedev_name);
 
 char *
-virNodeDeviceCreateVport(virConnectPtr conn,
-                         virStorageAdapterFCHostPtr fchost);
+virNodeDeviceCreateVport(virStorageAdapterFCHostPtr fchost);
 
 int
 virNodeDeviceDeleteVport(virConnectPtr conn,
diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index e6aa6431e4..359d2d2597 100644
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -294,7 +294,7 @@ createVport(virConnectPtr conn,
         }
     }
 
-    if (!(name = virNodeDeviceCreateVport(conn, fchost)))
+    if (!(name = virNodeDeviceCreateVport(fchost)))
         goto cleanup;
 
     /* Creating our own VPORT didn't leave enough time to find any LUN's,