External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-03 10:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

nodedev: Break out virNodeDeviceHasCap to node_conf

Browse Source 
Will be used by test driver node device implementation.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2009-10-01 14:53:43 -04:00
parent 112746cdc5
commit 6e24ccb266
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/conf/node_device_conf.c
View File

@ -80,6 +80,16 @@ virNodeDevCapsDefParseString(virConnectPtr conn,
return 0; return 0;
} }
int virNodeDeviceHasCap(const virNodeDeviceObjPtr dev, const char *cap)
{
virNodeDevCapsDefPtr caps = dev->def->caps;
while (caps) {
if (STREQ(cap, virNodeDevCapTypeToString(caps->type)))
return 1;
caps = caps->next;
}
return 0;
}
virNodeDeviceObjPtr virNodeDeviceFindByName(const virNodeDeviceObjListPtr devs, virNodeDeviceObjPtr virNodeDeviceFindByName(const virNodeDeviceObjListPtr devs,
const char *name) const char *name)

2
src/conf/node_device_conf.h
View File

@ -193,6 +193,8 @@ struct _virDeviceMonitorState {
virReportErrorHelper(conn, VIR_FROM_NODEDEV, code, __FILE__, \ virReportErrorHelper(conn, VIR_FROM_NODEDEV, code, __FILE__, \
__FUNCTION__, __LINE__, fmt) __FUNCTION__, __LINE__, fmt)
int virNodeDeviceHasCap(const virNodeDeviceObjPtr dev, const char *cap);
virNodeDeviceObjPtr virNodeDeviceFindByName(const virNodeDeviceObjListPtr devs, virNodeDeviceObjPtr virNodeDeviceFindByName(const virNodeDeviceObjListPtr devs,
const char *name); const char *name);

1
src/libvirt_private.syms
View File

@ -302,6 +302,7 @@ nodeGetFreeMemory;
# node_device_conf.h # node_device_conf.h
virNodeDeviceHasCap;
virNodeDeviceObjRemove; virNodeDeviceObjRemove;
virNodeDevCapTypeToString; virNodeDevCapTypeToString;
virNodeDeviceFindByName; virNodeDeviceFindByName;

15
src/node_device/node_device_driver.c
View File

@ -39,17 +39,6 @@
#define VIR_FROM_THIS VIR_FROM_NODEDEV #define VIR_FROM_THIS VIR_FROM_NODEDEV
static int dev_has_cap(const virNodeDeviceObjPtr dev, const char *cap)
{
virNodeDevCapsDefPtr caps = dev->def->caps;
while (caps) {
if (STREQ(cap, virNodeDevCapTypeToString(caps->type)))
return 1;
caps = caps->next;
}
return 0;
}
static int update_caps(virNodeDeviceObjPtr dev) static int update_caps(virNodeDeviceObjPtr dev)
{ {
@ -157,7 +146,7 @@ static int nodeNumOfDevices(virConnectPtr conn,
for (i = 0; i < driver->devs.count; i++) { for (i = 0; i < driver->devs.count; i++) {
virNodeDeviceObjLock(driver->devs.objs[i]); virNodeDeviceObjLock(driver->devs.objs[i]);
if ((cap == NULL) || if ((cap == NULL) ||
dev_has_cap(driver->devs.objs[i], cap)) virNodeDeviceHasCap(driver->devs.objs[i], cap))
++ndevs; ++ndevs;
virNodeDeviceObjUnlock(driver->devs.objs[i]); virNodeDeviceObjUnlock(driver->devs.objs[i]);
} }
@ -180,7 +169,7 @@ nodeListDevices(virConnectPtr conn,
for (i = 0; i < driver->devs.count && ndevs < maxnames; i++) { for (i = 0; i < driver->devs.count && ndevs < maxnames; i++) {
virNodeDeviceObjLock(driver->devs.objs[i]); virNodeDeviceObjLock(driver->devs.objs[i]);
if (cap == NULL || if (cap == NULL ||
dev_has_cap(driver->devs.objs[i], cap)) { virNodeDeviceHasCap(driver->devs.objs[i], cap)) {
if ((names[ndevs++] = strdup(driver->devs.objs[i]->def->name)) == NULL) { if ((names[ndevs++] = strdup(driver->devs.objs[i]->def->name)) == NULL) {
virNodeDeviceObjUnlock(driver->devs.objs[i]); virNodeDeviceObjUnlock(driver->devs.objs[i]);
goto failure; goto failure;