4:46 p.m.
v1: https://www.redhat.com/archives/libvir-list/2018-February/msg01135.html
virnodedeviceobj.c generic ListAll infrastructure is not stateless
and will try to refresh nodedev scsi/pci/etc. config. Understandable
this doesn't play well with the test driver. Trying to untangle it
is a bit tough though.
This series adds a way to skip touching the host so we can implement
ListAllDevices in the test driver, which we want for virt-manager and
libvirt-dbus test suites
Cole Robinson (2):
conf: nodedev: Don't refresh host caps in testdriver
test: Implement virConnectListAllNodeDevices
src/conf/virnodedeviceobj.c | 13 ++++++++++++-
src/conf/virnodedeviceobj.h | 4 ++++
src/test/test_driver.c | 15 +++++++++++++++
3 files changed, 31 insertions(+), 1 deletion(-)
--
2.17.1
4:46 p.m.
New subject: [libvirt] [PATCH v2 1/2] conf: nodedev: Don't refresh host caps in testdriver
Add a 'skipUpdateCaps' bool that we set for test_driver.c nodedevs
which will skip accessing host resources via virNodeDeviceUpdateCaps
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
src/conf/virnodedeviceobj.c | 13 ++++++++++++-
src/conf/virnodedeviceobj.h | 4 ++++
src/test/test_driver.c | 2 ++
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 13e9a17518..6c04caf6ab 100644
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -37,6 +37,8 @@ struct _virNodeDeviceObj {
virObjectLockable parent;
virNodeDeviceDefPtr def; /* device definition */
+ bool skipUpdateCaps; /* whether to skip checking host caps,
+ used by testdriver */
};
struct _virNodeDeviceObjList {
@@ -806,7 +808,8 @@ virNodeDeviceMatch(virNodeDeviceObjPtr obj,
unsigned int flags)
{
/* Refresh the capabilities first, e.g. due to a driver change */
- if (virNodeDeviceUpdateCaps(obj->def) < 0)
+ if (!obj->skipUpdateCaps &&
+ virNodeDeviceUpdateCaps(obj->def) < 0)
return false;
/* filter by cap type */
@@ -915,3 +918,11 @@ virNodeDeviceObjListExport(virConnectPtr conn,
virObjectListFree(data.devices);
return -1;
}
+
+
+void
+virNodeDeviceObjSetSkipUpdateCaps(virNodeDeviceObjPtr obj,
+ bool skipUpdateCaps)
+{
+ obj->skipUpdateCaps = skipUpdateCaps;
+}
diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h
index 87f9083696..ffbe4e32e5 100644
--- a/src/conf/virnodedeviceobj.h
+++ b/src/conf/virnodedeviceobj.h
@@ -109,4 +109,8 @@ virNodeDeviceObjListExport(virConnectPtr conn,
virNodeDeviceObjListFilter filter,
unsigned int flags);
+void
+virNodeDeviceObjSetSkipUpdateCaps(virNodeDeviceObjPtr obj,
+ bool skipUpdateCaps);
+
#endif /* __VIRNODEDEVICEOBJ_H__ */
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 951d9c4151..7374c83eaa 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1165,6 +1165,7 @@ testParseNodedevs(testDriverPtr privconn,
goto error;
}
+ virNodeDeviceObjSetSkipUpdateCaps(obj, true);
virNodeDeviceObjEndAPI(&obj);
}
@@ -5565,6 +5566,7 @@ testNodeDeviceMockCreateVport(testDriverPtr driver,
goto cleanup;
def = NULL;
objdef = virNodeDeviceObjGetDef(obj);
+ virNodeDeviceObjSetSkipUpdateCaps(obj, true);
event = virNodeDeviceEventLifecycleNew(objdef->name,
VIR_NODE_DEVICE_EVENT_CREATED,
--
2.17.1
5:47 a.m.
New subject: [libvirt] [PATCH v2 1/2] conf: nodedev: Don't refresh host caps in testdriver
On Tue, Jul 10, 2018 at 05:46:01PM -0400, Cole Robinson wrote:
Add a 'skipUpdateCaps' bool that we set for test_driver.c
nodedevs
which will skip accessing host resources via virNodeDeviceUpdateCaps
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
...
@@ -5565,6 +5566,7 @@ testNodeDeviceMockCreateVport(testDriverPtr
driver,
goto cleanup;
def = NULL;
objdef = virNodeDeviceObjGetDef(obj);
+ virNodeDeviceObjSetSkipUpdateCaps(obj, true);
I'd probably move this 2 lines up, but I don't really care.
4:46 p.m.
New subject: [libvirt] [PATCH v2 2/2] test: Implement virConnectListAllNodeDevices
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
src/test/test_driver.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 7374c83eaa..3bc79bf358 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -5381,6 +5381,18 @@ testNodeListDevices(virConnectPtr conn,
cap, names, maxnames);
}
+static int
+testConnectListAllNodeDevices(virConnectPtr conn,
+ virNodeDevicePtr **devices,
+ unsigned int flags)
+{
+ testDriverPtr driver = conn->privateData;
+
+ virCheckFlags(VIR_CONNECT_LIST_NODE_DEVICES_FILTERS_CAP, -1);
+
+ return virNodeDeviceObjListExport(conn, driver->devs, devices,
+ NULL, flags);
+}
static virNodeDevicePtr
testNodeDeviceLookupByName(virConnectPtr conn, const char *name)
@@ -7017,6 +7029,7 @@ static virStorageDriver testStorageDriver = {
};
static virNodeDeviceDriver testNodeDeviceDriver = {
+ .connectListAllNodeDevices = testConnectListAllNodeDevices, /* 4.1.0 */
.connectNodeDeviceEventRegisterAny = testConnectNodeDeviceEventRegisterAny, /* 2.2.0
*/
.connectNodeDeviceEventDeregisterAny = testConnectNodeDeviceEventDeregisterAny, /*
2.2.0 */
.nodeNumOfDevices = testNodeNumOfDevices, /* 0.7.2 */
--
2.17.1
5:47 a.m.
On Tue, Jul 10, 2018 at 05:46:00PM -0400, Cole Robinson wrote:
v1:
https://www.redhat.com/archives/libvir-list/2018-February/msg01135.html
virnodedeviceobj.c generic ListAll infrastructure is not stateless
and will try to refresh nodedev scsi/pci/etc. config. Understandable
this doesn't play well with the test driver. Trying to untangle it
is a bit tough though.
This series adds a way to skip touching the host so we can implement
ListAllDevices in the test driver, which we want for virt-manager and
libvirt-dbus test suites
Cole Robinson (2):
conf: nodedev: Don't refresh host caps in testdriver
test: Implement virConnectListAllNodeDevices
src/conf/virnodedeviceobj.c | 13 ++++++++++++-
src/conf/virnodedeviceobj.h | 4 ++++
src/test/test_driver.c | 15 +++++++++++++++
3 files changed, 31 insertions(+), 1 deletion(-)
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
2324
days inactive
2327
days old
4 comments
2 participants
participants (2)
-
Cole Robinson -
Erik Skultety