提交 214a353c 编写于 作者: J John Ferlan

storage: Remove @conn from virNodeDeviceCreateVport

It's no longer needed since the checkParent code moved back to
storage_backend_scsi.c
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
上级 c4030331
...@@ -2260,7 +2260,6 @@ virNodeDeviceGetParentName(virConnectPtr conn, ...@@ -2260,7 +2260,6 @@ virNodeDeviceGetParentName(virConnectPtr conn,
/** /**
* @conn: Connection pointer
* @fchost: Pointer to vHBA adapter * @fchost: Pointer to vHBA adapter
* *
* Create a vHBA for Storage. This code accomplishes this via searching * Create a vHBA for Storage. This code accomplishes this via searching
...@@ -2273,16 +2272,15 @@ virNodeDeviceGetParentName(virConnectPtr conn, ...@@ -2273,16 +2272,15 @@ virNodeDeviceGetParentName(virConnectPtr conn,
* Returns vHBA name on success, NULL on failure with an error message set * Returns vHBA name on success, NULL on failure with an error message set
*/ */
char * char *
virNodeDeviceCreateVport(virConnectPtr conn, virNodeDeviceCreateVport(virStorageAdapterFCHostPtr fchost)
virStorageAdapterFCHostPtr fchost)
{ {
unsigned int parent_host; unsigned int parent_host;
char *name = NULL; char *name = NULL;
char *parent_hoststr = NULL; char *parent_hoststr = NULL;
bool skip_capable_check = false; bool skip_capable_check = false;
VIR_DEBUG("conn=%p, parent='%s', wwnn='%s' wwpn='%s'", VIR_DEBUG("parent='%s', wwnn='%s' wwpn='%s'",
conn, NULLSTR(fchost->parent), fchost->wwnn, fchost->wwpn); NULLSTR(fchost->parent), fchost->wwnn, fchost->wwpn);
if (fchost->parent) { if (fchost->parent) {
if (VIR_STRDUP(parent_hoststr, fchost->parent) < 0) if (VIR_STRDUP(parent_hoststr, fchost->parent) < 0)
......
...@@ -384,8 +384,7 @@ virNodeDeviceGetParentName(virConnectPtr conn, ...@@ -384,8 +384,7 @@ virNodeDeviceGetParentName(virConnectPtr conn,
const char *nodedev_name); const char *nodedev_name);
char * char *
virNodeDeviceCreateVport(virConnectPtr conn, virNodeDeviceCreateVport(virStorageAdapterFCHostPtr fchost);
virStorageAdapterFCHostPtr fchost);
int int
virNodeDeviceDeleteVport(virConnectPtr conn, virNodeDeviceDeleteVport(virConnectPtr conn,
......
...@@ -294,7 +294,7 @@ createVport(virConnectPtr conn, ...@@ -294,7 +294,7 @@ createVport(virConnectPtr conn,
} }
} }
if (!(name = virNodeDeviceCreateVport(conn, fchost))) if (!(name = virNodeDeviceCreateVport(fchost)))
goto cleanup; goto cleanup;
/* Creating our own VPORT didn't leave enough time to find any LUN's, /* Creating our own VPORT didn't leave enough time to find any LUN's,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册