6:31 a.m.
Merge code in node_device_driver.c and test_driver into virnodedeviceobj
to count the number of devices and to return a list of names. Also modify
the export list API to take an address of 'devobjs' to follow other usages.
FWIW: This is part of the common driver objects code I've been working
through. I figured I will post each driver separately rather than one
larger series.
John Ferlan (3):
nodedev: Introduce virNodeDeviceObjNumOfDevices
nodedev: Introduce virNodeDeviceObjGetNames
nodedev: Pass driver arg by ref
src/conf/virnodedeviceobj.c | 66 +++++++++++++++++++++++++++++++++---
src/conf/virnodedeviceobj.h | 20 ++++++++---
src/libvirt_private.syms | 3 +-
src/node_device/node_device_driver.c | 48 +++++++-------------------
src/test/test_driver.c | 33 ++++--------------
5 files changed, 98 insertions(+), 72 deletions(-)
--
2.9.3
6:31 a.m.
New subject: [libvirt] [PATCH 1/3] nodedev: Introduce virNodeDeviceObjNumOfDevices
Unify the NumOfDevices API into virnodedeviceobj.c from node_device_driver
and test_driver. The only real difference between the two is that the test
driver doesn't call the aclfilter API.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/virnodedeviceobj.c | 22 ++++++++++++++++++++++
src/conf/virnodedeviceobj.h | 6 ++++++
src/libvirt_private.syms | 1 +
src/node_device/node_device_driver.c | 12 ++----------
src/test/test_driver.c | 6 +-----
5 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 3fe3ae5..f0c20c2 100644
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -474,6 +474,28 @@ virNodeDeviceCapMatch(virNodeDeviceObjPtr devobj,
}
+int
+virNodeDeviceObjNumOfDevices(virNodeDeviceObjListPtr devs,
+ virConnectPtr conn,
+ const char *cap,
+ virNodeDeviceObjListFilter aclfilter)
+{
+ size_t i;
+ int ndevs = 0;
+
+ for (i = 0; i < devs->count; i++) {
+ virNodeDeviceObjPtr obj = devs->objs[i];
+ virNodeDeviceObjLock(obj);
+ if (aclfilter && aclfilter(conn, obj->def) &&
+ (!cap || virNodeDeviceObjHasCap(obj, cap)))
+ ++ndevs;
+ virNodeDeviceObjUnlock(obj);
+ }
+
+ return ndevs;
+}
+
+
#define MATCH(FLAG) ((flags & (VIR_CONNECT_LIST_NODE_DEVICES_CAP_ ## FLAG))
&& \
virNodeDeviceCapMatch(devobj, VIR_NODE_DEV_CAP_ ## FLAG))
static bool
diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h
index e32bbf8..7d303a0 100644
--- a/src/conf/virnodedeviceobj.h
+++ b/src/conf/virnodedeviceobj.h
@@ -83,6 +83,12 @@ typedef bool
virNodeDeviceDefPtr def);
int
+virNodeDeviceObjNumOfDevices(virNodeDeviceObjListPtr devs,
+ virConnectPtr conn,
+ const char *cap,
+ virNodeDeviceObjListFilter aclfilter);
+
+int
virNodeDeviceObjListExport(virConnectPtr conn,
virNodeDeviceObjList devobjs,
virNodeDevicePtr **devices,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 92083e5..104ed88 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -951,6 +951,7 @@ virNodeDeviceObjHasCap;
virNodeDeviceObjListExport;
virNodeDeviceObjListFree;
virNodeDeviceObjLock;
+virNodeDeviceObjNumOfDevices;
virNodeDeviceObjRemove;
virNodeDeviceObjUnlock;
diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 99f7bc5..f90b168 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -160,7 +160,6 @@ nodeNumOfDevices(virConnectPtr conn,
unsigned int flags)
{
int ndevs = 0;
- size_t i;
if (virNodeNumOfDevicesEnsureACL(conn) < 0)
return -1;
@@ -168,15 +167,8 @@ nodeNumOfDevices(virConnectPtr conn,
virCheckFlags(0, -1);
nodeDeviceLock();
- for (i = 0; i < driver->devs.count; i++) {
- virNodeDeviceObjPtr obj = driver->devs.objs[i];
- virNodeDeviceObjLock(obj);
- if (virNodeNumOfDevicesCheckACL(conn, obj->def) &&
- ((cap == NULL) ||
- virNodeDeviceObjHasCap(obj, cap)))
- ++ndevs;
- virNodeDeviceObjUnlock(obj);
- }
+ ndevs = virNodeDeviceObjNumOfDevices(&driver->devs, conn, cap,
+ virNodeNumOfDevicesCheckACL);
nodeDeviceUnlock();
return ndevs;
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index cce4d2d..2f1f4fa 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -5385,15 +5385,11 @@ testNodeNumOfDevices(virConnectPtr conn,
{
testDriverPtr driver = conn->privateData;
int ndevs = 0;
- size_t i;
virCheckFlags(0, -1);
testDriverLock(driver);
- for (i = 0; i < driver->devs.count; i++)
- if ((cap == NULL) ||
- virNodeDeviceObjHasCap(driver->devs.objs[i], cap))
- ++ndevs;
+ ndevs = virNodeDeviceObjNumOfDevices(&driver->devs, conn, cap, NULL);
testDriverUnlock(driver);
return ndevs;
--
2.9.3
6:31 a.m.
New subject: [libvirt] [PATCH 2/3] nodedev: Introduce virNodeDeviceObjGetNames
Unify the *ListDevice API into virnodedeviceobj.c from node_device_driver
and test_driver. The only real difference between the two is that the test
driver doesn't call the aclfilter API. The name of the new API follows that
of other drivers to "GetNames".
NB: Change some variable names to match what they really are - consistency
with other drivers. Also added a clear of the input names.
This also allows virNodeDeviceObjHasCap to be static to virnodedeviceobj
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/virnodedeviceobj.c | 36 +++++++++++++++++++++++++++++++++++-
src/conf/virnodedeviceobj.h | 12 ++++++++----
src/libvirt_private.syms | 2 +-
src/node_device/node_device_driver.c | 34 ++++++++++------------------------
src/test/test_driver.c | 27 ++++++---------------------
5 files changed, 60 insertions(+), 51 deletions(-)
diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index f0c20c2..5a8dfe7 100644
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -33,7 +33,7 @@
VIR_LOG_INIT("conf.virnodedeviceobj");
-int
+static int
virNodeDeviceObjHasCap(const virNodeDeviceObj *dev,
const char *cap)
{
@@ -496,6 +496,40 @@ virNodeDeviceObjNumOfDevices(virNodeDeviceObjListPtr devs,
}
+int
+virNodeDeviceObjGetNames(virNodeDeviceObjListPtr devs,
+ virConnectPtr conn,
+ virNodeDeviceObjListFilter aclfilter,
+ const char *cap,
+ char **const names,
+ int maxnames)
+{
+ int nnames = 0;
+ size_t i;
+
+ for (i = 0; i < devs->count && nnames < maxnames; i++) {
+ virNodeDeviceObjPtr obj = devs->objs[i];
+ virNodeDeviceObjLock(obj);
+ if (aclfilter && aclfilter(conn, obj->def) &&
+ (!cap || virNodeDeviceObjHasCap(obj, cap))) {
+ if (VIR_STRDUP(names[nnames++], obj->def->name) < 0) {
+ virNodeDeviceObjUnlock(obj);
+ goto failure;
+ }
+ }
+ virNodeDeviceObjUnlock(obj);
+ }
+
+ return nnames;
+
+ failure:
+ while (--nnames >= 0)
+ VIR_FREE(names[nnames]);
+ memset(names, 0, maxnames * sizeof(*names));
+ return -1;
+}
+
+
#define MATCH(FLAG) ((flags & (VIR_CONNECT_LIST_NODE_DEVICES_CAP_ ## FLAG))
&& \
virNodeDeviceCapMatch(devobj, VIR_NODE_DEV_CAP_ ## FLAG))
static bool
diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h
index 7d303a0..0acd8ce 100644
--- a/src/conf/virnodedeviceobj.h
+++ b/src/conf/virnodedeviceobj.h
@@ -40,10 +40,6 @@ struct _virNodeDeviceDriverState {
};
-int
-virNodeDeviceObjHasCap(const virNodeDeviceObj *dev,
- const char *cap);
-
virNodeDeviceObjPtr
virNodeDeviceObjFindByName(virNodeDeviceObjListPtr devs,
const char *name);
@@ -89,6 +85,14 @@ virNodeDeviceObjNumOfDevices(virNodeDeviceObjListPtr devs,
virNodeDeviceObjListFilter aclfilter);
int
+virNodeDeviceObjGetNames(virNodeDeviceObjListPtr devs,
+ virConnectPtr conn,
+ virNodeDeviceObjListFilter aclfilter,
+ const char *cap,
+ char **const names,
+ int maxnames);
+
+int
virNodeDeviceObjListExport(virConnectPtr conn,
virNodeDeviceObjList devobjs,
virNodeDevicePtr **devices,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 104ed88..5df6a5d 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -946,8 +946,8 @@ virInterfaceObjUnlock;
virNodeDeviceObjAssignDef;
virNodeDeviceObjFindByName;
virNodeDeviceObjFindBySysfsPath;
+virNodeDeviceObjGetNames;
virNodeDeviceObjGetParentHost;
-virNodeDeviceObjHasCap;
virNodeDeviceObjListExport;
virNodeDeviceObjListFree;
virNodeDeviceObjLock;
diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index f90b168..e850a22 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -174,14 +174,17 @@ nodeNumOfDevices(virConnectPtr conn,
return ndevs;
}
+
int
nodeListDevices(virConnectPtr conn,
const char *cap,
- char **const names, int maxnames,
+ char **const names,
+ int maxnames,
unsigned int flags)
{
- int ndevs = 0;
- size_t i;
+ int nnames;
+
+ memset(names, 0, maxnames * sizeof(*names));
if (virNodeListDevicesEnsureACL(conn) < 0)
return -1;
@@ -189,29 +192,12 @@ nodeListDevices(virConnectPtr conn,
virCheckFlags(0, -1);
nodeDeviceLock();
- for (i = 0; i < driver->devs.count && ndevs < maxnames; i++) {
- virNodeDeviceObjPtr obj = driver->devs.objs[i];
- virNodeDeviceObjLock(obj);
- if (virNodeListDevicesCheckACL(conn, obj->def) &&
- (cap == NULL ||
- virNodeDeviceObjHasCap(obj, cap))) {
- if (VIR_STRDUP(names[ndevs++], obj->def->name) < 0) {
- virNodeDeviceObjUnlock(obj);
- goto failure;
- }
- }
- virNodeDeviceObjUnlock(obj);
- }
+ nnames = virNodeDeviceObjGetNames(&driver->devs, conn,
+ virNodeListDevicesCheckACL,
+ cap, names, maxnames);
nodeDeviceUnlock();
- return ndevs;
-
- failure:
- nodeDeviceUnlock();
- --ndevs;
- while (--ndevs >= 0)
- VIR_FREE(names[ndevs]);
- return -1;
+ return nnames;
}
int
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 2f1f4fa..a9040e8 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -5395,6 +5395,7 @@ testNodeNumOfDevices(virConnectPtr conn,
return ndevs;
}
+
static int
testNodeListDevices(virConnectPtr conn,
const char *cap,
@@ -5403,35 +5404,19 @@ testNodeListDevices(virConnectPtr conn,
unsigned int flags)
{
testDriverPtr driver = conn->privateData;
- int ndevs = 0;
- size_t i;
+ int nnames = 0;
virCheckFlags(0, -1);
testDriverLock(driver);
- for (i = 0; i < driver->devs.count && ndevs < maxnames; i++) {
- virNodeDeviceObjLock(driver->devs.objs[i]);
- if (cap == NULL ||
- virNodeDeviceObjHasCap(driver->devs.objs[i], cap)) {
- if (VIR_STRDUP(names[ndevs++], driver->devs.objs[i]->def->name) <
0) {
- virNodeDeviceObjUnlock(driver->devs.objs[i]);
- goto failure;
- }
- }
- virNodeDeviceObjUnlock(driver->devs.objs[i]);
- }
+ nnames = virNodeDeviceObjGetNames(&driver->devs, conn, NULL,
+ cap, names, maxnames);
testDriverUnlock(driver);
- return ndevs;
-
- failure:
- testDriverUnlock(driver);
- --ndevs;
- while (--ndevs >= 0)
- VIR_FREE(names[ndevs]);
- return -1;
+ return nnames;
}
+
static virNodeDevicePtr
testNodeDeviceLookupByName(virConnectPtr conn, const char *name)
{
--
2.9.3
6:14 a.m.
New subject: [libvirt] [PATCH 2/3] nodedev: Introduce virNodeDeviceObjGetNames
On 04/06/2017 01:31 PM, John Ferlan wrote:
Unify the *ListDevice API into virnodedeviceobj.c from
node_device_driver
and test_driver. The only real difference between the two is that the test
driver doesn't call the aclfilter API. The name of the new API follows that
of other drivers to "GetNames".
NB: Change some variable names to match what they really are - consistency
with other drivers. Also added a clear of the input names.
This also allows virNodeDeviceObjHasCap to be static to virnodedeviceobj
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/virnodedeviceobj.c | 36 +++++++++++++++++++++++++++++++++++-
src/conf/virnodedeviceobj.h | 12 ++++++++----
src/libvirt_private.syms | 2 +-
src/node_device/node_device_driver.c | 34 ++++++++++------------------------
src/test/test_driver.c | 27 ++++++---------------------
5 files changed, 60 insertions(+), 51 deletions(-)
diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index f0c20c2..5a8dfe7 100644
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -33,7 +33,7 @@
VIR_LOG_INIT("conf.virnodedeviceobj");
-int
+static int
virNodeDeviceObjHasCap(const virNodeDeviceObj *dev,
const char *cap)
{
@@ -496,6 +496,40 @@ virNodeDeviceObjNumOfDevices(virNodeDeviceObjListPtr devs,
}
+int
+virNodeDeviceObjGetNames(virNodeDeviceObjListPtr devs,
+ virConnectPtr conn,
+ virNodeDeviceObjListFilter aclfilter,
+ const char *cap,
+ char **const names,
+ int maxnames)
+{
+ int nnames = 0;
+ size_t i;
+
+ for (i = 0; i < devs->count && nnames < maxnames; i++) {
+ virNodeDeviceObjPtr obj = devs->objs[i];
+ virNodeDeviceObjLock(obj);
+ if (aclfilter && aclfilter(conn, obj->def) &&
+ (!cap || virNodeDeviceObjHasCap(obj, cap))) {
+ if (VIR_STRDUP(names[nnames++], obj->def->name) < 0) {
+ virNodeDeviceObjUnlock(obj);
+ goto failure;
+ }
+ }
+ virNodeDeviceObjUnlock(obj);
+ }
+
+ return nnames;
+
+ failure:
+ while (--nnames >= 0)
+ VIR_FREE(names[nnames]);
+ memset(names, 0, maxnames * sizeof(*names));
Like you've said in our discussion to early series, this is no longer here.
+ return -1;
+}
+
+
#define MATCH(FLAG) ((flags & (VIR_CONNECT_LIST_NODE_DEVICES_CAP_ ## FLAG))
&& \
virNodeDeviceCapMatch(devobj, VIR_NODE_DEV_CAP_ ## FLAG))
static bool
diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h
index 7d303a0..0acd8ce 100644
--- a/src/conf/virnodedeviceobj.h
+++ b/src/conf/virnodedeviceobj.h
@@ -40,10 +40,6 @@ struct _virNodeDeviceDriverState {
};
-int
-virNodeDeviceObjHasCap(const virNodeDeviceObj *dev,
- const char *cap);
-
virNodeDeviceObjPtr
virNodeDeviceObjFindByName(virNodeDeviceObjListPtr devs,
const char *name);
@@ -89,6 +85,14 @@ virNodeDeviceObjNumOfDevices(virNodeDeviceObjListPtr devs,
virNodeDeviceObjListFilter aclfilter);
int
+virNodeDeviceObjGetNames(virNodeDeviceObjListPtr devs,
+ virConnectPtr conn,
+ virNodeDeviceObjListFilter aclfilter,
+ const char *cap,
+ char **const names,
+ int maxnames);
+
+int
virNodeDeviceObjListExport(virConnectPtr conn,
virNodeDeviceObjList devobjs,
virNodeDevicePtr **devices,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 104ed88..5df6a5d 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -946,8 +946,8 @@ virInterfaceObjUnlock;
virNodeDeviceObjAssignDef;
virNodeDeviceObjFindByName;
virNodeDeviceObjFindBySysfsPath;
+virNodeDeviceObjGetNames;
virNodeDeviceObjGetParentHost;
-virNodeDeviceObjHasCap;
virNodeDeviceObjListExport;
virNodeDeviceObjListFree;
virNodeDeviceObjLock;
diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index f90b168..e850a22 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -174,14 +174,17 @@ nodeNumOfDevices(virConnectPtr conn,
return ndevs;
}
+
int
nodeListDevices(virConnectPtr conn,
const char *cap,
- char **const names, int maxnames,
+ char **const names,
+ int maxnames,
unsigned int flags)
{
- int ndevs = 0;
- size_t i;
+ int nnames;
+
+ memset(names, 0, maxnames * sizeof(*names));
Nor this.
if (virNodeListDevicesEnsureACL(conn) < 0)
return -1;
Michal
6:32 a.m.
New subject: [libvirt] [PATCH 3/3] nodedev: Pass driver arg by ref
Alter virNodeDeviceObjListExport in order to pass the drivers->devs
by reference
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/virnodedeviceobj.c | 8 ++++----
src/conf/virnodedeviceobj.h | 2 +-
src/node_device/node_device_driver.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 5a8dfe7..fc82799 100644
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -561,7 +561,7 @@ virNodeDeviceMatch(virNodeDeviceObjPtr devobj,
int
virNodeDeviceObjListExport(virConnectPtr conn,
- virNodeDeviceObjList devobjs,
+ virNodeDeviceObjListPtr devobjs,
virNodeDevicePtr **devices,
virNodeDeviceObjListFilter filter,
unsigned int flags)
@@ -572,11 +572,11 @@ virNodeDeviceObjListExport(virConnectPtr conn,
int ret = -1;
size_t i;
- if (devices && VIR_ALLOC_N(tmp_devices, devobjs.count + 1) < 0)
+ if (devices && VIR_ALLOC_N(tmp_devices, devobjs->count + 1) < 0)
goto cleanup;
- for (i = 0; i < devobjs.count; i++) {
- virNodeDeviceObjPtr devobj = devobjs.objs[i];
+ for (i = 0; i < devobjs->count; i++) {
+ virNodeDeviceObjPtr devobj = devobjs->objs[i];
virNodeDeviceObjLock(devobj);
if ((!filter || filter(conn, devobj->def)) &&
virNodeDeviceMatch(devobj, flags)) {
diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h
index 0acd8ce..b8b534b 100644
--- a/src/conf/virnodedeviceobj.h
+++ b/src/conf/virnodedeviceobj.h
@@ -94,7 +94,7 @@ virNodeDeviceObjGetNames(virNodeDeviceObjListPtr devs,
int
virNodeDeviceObjListExport(virConnectPtr conn,
- virNodeDeviceObjList devobjs,
+ virNodeDeviceObjListPtr devobjs,
virNodeDevicePtr **devices,
virNodeDeviceObjListFilter filter,
unsigned int flags);
diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index e850a22..269b086 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -213,7 +213,7 @@ nodeConnectListAllNodeDevices(virConnectPtr conn,
return -1;
nodeDeviceLock();
- ret = virNodeDeviceObjListExport(conn, driver->devs, devices,
+ ret = virNodeDeviceObjListExport(conn, &driver->devs, devices,
virConnectListAllNodeDevicesCheckACL,
flags);
nodeDeviceUnlock();
--
2.9.3
6:14 a.m.
On 04/06/2017 01:31 PM, John Ferlan wrote:
Merge code in node_device_driver.c and test_driver into
virnodedeviceobj
to count the number of devices and to return a list of names. Also modify
the export list API to take an address of 'devobjs' to follow other usages.
FWIW: This is part of the common driver objects code I've been working
through. I figured I will post each driver separately rather than one
larger series.
John Ferlan (3):
nodedev: Introduce virNodeDeviceObjNumOfDevices
nodedev: Introduce virNodeDeviceObjGetNames
nodedev: Pass driver arg by ref
src/conf/virnodedeviceobj.c | 66 +++++++++++++++++++++++++++++++++---
src/conf/virnodedeviceobj.h | 20 ++++++++---
src/libvirt_private.syms | 3 +-
src/node_device/node_device_driver.c | 48 +++++++-------------------
src/test/test_driver.c | 33 ++++--------------
5 files changed, 98 insertions(+), 72 deletions(-)
ACK
Michal
2783
days inactive
2787
days old
5 comments
2 participants
participants (2)
-
John Ferlan -
Michal Privoznik