External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: Remove @conn from virNodeDeviceCreateVport

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

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-07-18 09:51:08 -04:00
parent c4030331c8
commit 214a353c02
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/node_device_conf.c
View 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)

3
src/conf/node_device_conf.h
View 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,

2
src/storage/storage_backend_scsi.c
View 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,