]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
storage: Remove @conn from virNodeDeviceCreateVport
authorJohn Ferlan <jferlan@redhat.com>
Tue, 18 Jul 2017 13:51:08 +0000 (09:51 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Mon, 24 Jul 2017 16:27:41 +0000 (12:27 -0400)
It's no longer needed since the checkParent code moved back to
storage_backend_scsi.c

Signed-off-by: John Ferlan <jferlan@redhat.com>
src/conf/node_device_conf.c
src/conf/node_device_conf.h
src/storage/storage_backend_scsi.c

index 9c0ffa561a85a999ecb89ab74e88f4167d4deeb7..82f02fa6c8c2602adf7aa9d1eb15e344f83d17b1 100644 (file)
@@ -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)
index d10683d69e3f4ba4a82fbe34cf16ac108ec8e326..da56eaffa480a6b82ea47a084de059a1c91d64b9 100644 (file)
@@ -384,8 +384,7 @@ virNodeDeviceGetParentName(virConnectPtr conn,
                            const char *nodedev_name);
 
 char *
-virNodeDeviceCreateVport(virConnectPtr conn,
-                         virStorageAdapterFCHostPtr fchost);
+virNodeDeviceCreateVport(virStorageAdapterFCHostPtr fchost);
 
 int
 virNodeDeviceDeleteVport(virConnectPtr conn,
index e6aa6431e4e1a793da3788ae5c0d104ac2a36388..359d2d2597396c74e273e4997e39c5bab688842c 100644 (file)
@@ -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,