External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: Move and rename getVhbaSCSIHostParent

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1159180

Move the API from the backend to storage_conf and rename it to
virStoragePoolGetVhbaSCSIHostParent.  A future patch will need to
use this functionality from storage_conf
This commit is contained in:
John Ferlan 2014-11-17 08:40:59 -05:00
parent 934c388789
commit 7b4cdb6eaa
4 changed files with 67 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/conf/storage_conf.c
View File

@ -2078,6 +2078,65 @@ virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools,
return ret;
}
/*
* virStoragePoolGetVhbaSCSIHostParent:
*
* Using the Node Device Driver, find the host# name found via wwnn/wwpn
* lookup in the fc_host sysfs tree (e.g. virGetFCHostNameByWWN) to get
* the parent 'scsi_host#'.
*
* @conn: Connection pointer (must be non-NULL on entry)
* @name: Pointer a string from a virGetFCHostNameByWWN (e.g., "host#")
*
* Returns a "scsi_host#" string of the parent of the vHBA
*/
char *
virStoragePoolGetVhbaSCSIHostParent(virConnectPtr conn,
const char *name)
{
char *nodedev_name = NULL;
virNodeDevicePtr device = NULL;
char *xml = NULL;
virNodeDeviceDefPtr def = NULL;
char *vhba_parent = NULL;
VIR_DEBUG("conn=%p, name=%s", conn, name);
/* We get passed "host#" from the return from virGetFCHostNameByWWN,
* so we need to adjust that to what the nodedev lookup expects
*/
if (virAsprintf(&nodedev_name, "scsi_%s", name) < 0)
goto cleanup;
/* Compare the scsi_host for the name with the provided parent
* if not the same, then fail
*/
if (!(device = virNodeDeviceLookupByName(conn, nodedev_name))) {
virReportError(VIR_ERR_XML_ERROR,
_("Cannot find '%s' in node device database"),
nodedev_name);
goto cleanup;
}
if (!(xml = virNodeDeviceGetXMLDesc(device, 0)))
goto cleanup;
if (!(def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL)))
goto cleanup;
/* The caller checks whether the returned value is NULL or not
* before continuing
*/
ignore_value(VIR_STRDUP(vhba_parent, def->parent));
cleanup:
VIR_FREE(nodedev_name);
virNodeDeviceDefFree(def);
VIR_FREE(xml);
virObjectUnref(device);
return vhba_parent;
}
static int
getSCSIHostNumber(virStoragePoolSourceAdapter adapter,
unsigned int *hostnum)

5
src/conf/storage_conf.h
View File

@ -30,6 +30,7 @@
# include "virbitmap.h"
# include "virthread.h"
# include "device_conf.h"
# include "node_device_conf.h"
# include <libxml/tree.h>
@ -389,6 +390,10 @@ int virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools,
virStoragePoolDefPtr def,
unsigned int check_active);
char *virStoragePoolGetVhbaSCSIHostParent(virConnectPtr conn,
const char *name)
ATTRIBUTE_NONNULL(1);
int virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools,
virStoragePoolDefPtr def);

1
src/libvirt_private.syms
View File

@ -744,6 +744,7 @@ virStoragePoolDefParseString;
virStoragePoolFormatDiskTypeToString;
virStoragePoolFormatFileSystemNetTypeToString;
virStoragePoolFormatFileSystemTypeToString;
virStoragePoolGetVhbaSCSIHostParent;
virStoragePoolLoadAllConfigs;
virStoragePoolObjAssignDef;
virStoragePoolObjClearVols;

66
src/storage/storage_backend_scsi.c
View File

@ -34,7 +34,6 @@
#include "virlog.h"
#include "virfile.h"
#include "vircommand.h"
#include "viraccessapicheck.h"
#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
@ -630,67 +629,6 @@ getAdapterName(virStoragePoolSourceAdapter adapter)
return name;
}
/*
* Using the host# name found via wwnn/wwpn lookup in the fc_host
* sysfs tree to get the parent 'scsi_host#'. On entry we need 'conn'
* set. We won't get here from the autostart path since the caller
* will return true before calling this function. For the shutdown
* path we won't be able to delete the vport.
*/
static char * ATTRIBUTE_NONNULL(1)
getVhbaSCSIHostParent(virConnectPtr conn,
const char *name)
{
char *nodedev_name = NULL;
virNodeDevicePtr device = NULL;
char *xml = NULL;
virNodeDeviceDefPtr def = NULL;
char *vhba_parent = NULL;
virErrorPtr savedError = NULL;
VIR_DEBUG("conn=%p, name=%s", conn, name);
/* We get passed "host#" from the return from virGetFCHostNameByWWN,
* so we need to adjust that to what the nodedev lookup expects
*/
if (virAsprintf(&nodedev_name, "scsi_%s", name) < 0)
goto cleanup;
/* Compare the scsi_host for the name with the provided parent
* if not the same, then fail
*/
if (!(device = virNodeDeviceLookupByName(conn, nodedev_name))) {
virReportError(VIR_ERR_XML_ERROR,
_("Cannot find '%s' in node device database"),
nodedev_name);
goto cleanup;
}
if (!(xml = virNodeDeviceGetXMLDesc(device, 0)))
goto cleanup;
if (!(def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL)))
goto cleanup;
/* The caller checks whether the returned value is NULL or not
* before continuing
*/
ignore_value(VIR_STRDUP(vhba_parent, def->parent));
cleanup:
if (!vhba_parent)
savedError = virSaveLastError();
VIR_FREE(nodedev_name);
virNodeDeviceDefFree(def);
VIR_FREE(xml);
virNodeDeviceFree(device);
if (savedError) {
virSetError(savedError);
virFreeError(savedError);
}
return vhba_parent;
}
/*
* Using the host# name found via wwnn/wwpn lookup in the fc_host
* sysfs tree to get the parent 'scsi_host#' to ensure it matches.
@ -709,7 +647,7 @@ checkVhbaSCSIHostParent(virConnectPtr conn,
if (!conn)
return true;
if (!(vhba_parent = getVhbaSCSIHostParent(conn, name)))
if (!(vhba_parent = virStoragePoolGetVhbaSCSIHostParent(conn, name)))
goto cleanup;
if (STRNEQ(parent_name, vhba_parent)) {
@ -886,7 +824,7 @@ deleteVport(virConnectPtr conn,
if (virGetSCSIHostNumber(adapter.data.fchost.parent, &parent_host) < 0)
goto cleanup;
} else {
if (!(vhba_parent = getVhbaSCSIHostParent(conn, name)))
if (!(vhba_parent = virStoragePoolGetVhbaSCSIHostParent(conn, name)))
goto cleanup;
if (virGetSCSIHostNumber(vhba_parent, &parent_host) < 0)