NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

storage: Change cbdata scsi refresh thread field name

Browse Source 
Change the field name from 'name' to 'fchost_name' to better id it.
This commit is contained in:
John Ferlan 2015-11-02 14:46:32 -05:00
parent 0c7a9b994c
commit 27432ba70c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/storage/storage_backend_scsi.c
View File

@ -43,7 +43,7 @@ VIR_LOG_INIT("storage.storage_backend_scsi");
typedef struct _virStoragePoolFCRefreshInfo virStoragePoolFCRefreshInfo; typedef struct _virStoragePoolFCRefreshInfo virStoragePoolFCRefreshInfo;
typedef virStoragePoolFCRefreshInfo *virStoragePoolFCRefreshInfoPtr; typedef virStoragePoolFCRefreshInfo *virStoragePoolFCRefreshInfoPtr;
struct _virStoragePoolFCRefreshInfo { struct _virStoragePoolFCRefreshInfo {
char *name; char *fchost_name;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
}; };
@ -565,7 +565,7 @@ virStoragePoolFCRefreshDataFree(void *opaque)
{ {
virStoragePoolFCRefreshInfoPtr cbdata = opaque; virStoragePoolFCRefreshInfoPtr cbdata = opaque;
VIR_FREE(cbdata->name); VIR_FREE(cbdata->fchost_name);
VIR_FREE(cbdata); VIR_FREE(cbdata);
} }
@ -593,7 +593,7 @@ static void
virStoragePoolFCRefreshThread(void *opaque) virStoragePoolFCRefreshThread(void *opaque)
{ {
virStoragePoolFCRefreshInfoPtr cbdata = opaque; virStoragePoolFCRefreshInfoPtr cbdata = opaque;
const char *name = cbdata->name; const char *fchost_name = cbdata->fchost_name;
virStoragePoolObjPtr pool = cbdata->pool; virStoragePoolObjPtr pool = cbdata->pool;
unsigned int host; unsigned int host;
int found = 0; int found = 0;
@ -606,10 +606,10 @@ virStoragePoolFCRefreshThread(void *opaque)
* rescan, and find LUN's, then we are happy * rescan, and find LUN's, then we are happy
*/ */
VIR_DEBUG("Attempt FC Refresh for pool='%s' name='%s' tries='%d'", VIR_DEBUG("Attempt FC Refresh for pool='%s' name='%s' tries='%d'",
pool->def->name, name, tries); pool->def->name, fchost_name, tries);
virStoragePoolObjLock(pool); virStoragePoolObjLock(pool);
if (virStoragePoolObjIsActive(pool) && if (virStoragePoolObjIsActive(pool) &&
virGetSCSIHostNumber(name, &host) == 0 && virGetSCSIHostNumber(fchost_name, &host) == 0 &&
virStorageBackendSCSITriggerRescan(host) == 0) { virStorageBackendSCSITriggerRescan(host) == 0) {
virStoragePoolObjClearVols(pool); virStoragePoolObjClearVols(pool);
found = virStorageBackendSCSIFindLUs(pool, host); found = virStorageBackendSCSIFindLUs(pool, host);
@ -799,7 +799,7 @@ createVport(virConnectPtr conn,
adapter->data.fchost.wwpn))) { adapter->data.fchost.wwpn))) {
if (VIR_ALLOC(cbdata) == 0) { if (VIR_ALLOC(cbdata) == 0) {
cbdata->pool = pool; cbdata->pool = pool;
cbdata->name = name; cbdata->fchost_name = name;
name = NULL; name = NULL;
if (virThreadCreate(&thread, false, virStoragePoolFCRefreshThread, if (virThreadCreate(&thread, false, virStoragePoolFCRefreshThread,