10:38 a.m.
This is to list the node device objects, supports to filter the results
by capability types.
include/libvirt/libvirt.h.in: Declare enum virConnectListAllNodeDeviceFlags
and virConnectListAllNodeDevices.
python/generator.py: Skip auto-generating
src/driver.h: (virDrvConnectListAllNodeDevices)
src/libvirt.c: Implement the public API
src/libvirt_public.syms: Export the symbol to public
---
include/libvirt/libvirt.h.in | 25 +++++++++++++++++
python/generator.py | 1 +
src/driver.h | 4 +++
src/libvirt.c | 62 ++++++++++++++++++++++++++++++++++++++++++
src/libvirt_public.syms | 1 +
5 files changed, 93 insertions(+), 0 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index dc6c98d..fcade4d 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -2804,6 +2804,31 @@ int virNodeListDevices (virConnectPtr
conn,
char **const names,
int maxnames,
unsigned int flags);
+/*
+ * virConnectListAllNodeDevices:
+ *
+ * Flags used to filter the returned node devices. Flags in each group
+ * are exclusive.
+ */
+typedef enum {
+ /* Reserved the first 6 bits for the possibility of persistent
+ * node device support in future.
+ */
+
+ VIR_CONNECT_LIST_NODE_DEVICES_CAP_SYSTEM = 1 << 6,
+ VIR_CONNECT_LIST_NODE_DEVICES_CAP_PCI_DEV = 1 << 7,
+ VIR_CONNECT_LIST_NODE_DEVICES_CAP_USB_DEV = 1 << 8,
+ VIR_CONNECT_LIST_NODE_DEVICES_CAP_USB_INTERFACE = 1 << 9,
+ VIR_CONNECT_LIST_NODE_DEVICES_CAP_NET = 1 << 10,
+ VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_HOST = 1 << 11,
+ VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_TARGET = 1 << 12,
+ VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI = 1 << 13,
+ VIR_CONNECT_LIST_NODE_DEVICES_CAP_STORAGE = 1 << 14,
+} virConnectListAllNodeDeviceFlags;
+
+int virConnectListAllNodeDevices (virConnectPtr conn,
+ virNodeDevicePtr **devices,
+ unsigned int flags);
virNodeDevicePtr virNodeDeviceLookupByName (virConnectPtr conn,
const char *name);
diff --git a/python/generator.py b/python/generator.py
index 25f7f46..f63730b 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -462,6 +462,7 @@ skip_function = (
'virStoragePoolListAllVolumes', # overridden in virStoragePool.py
'virConnectListAllNetworks', # overridden in virConnect.py
'virConnectListAllInterfaces', # overridden in virConnect.py
+ 'virConnectListAllNodeDevices', # overridden in virConnect.py
'virStreamRecvAll', # Pure python libvirt-override-virStream.py
'virStreamSendAll', # Pure python libvirt-override-virStream.py
diff --git a/src/driver.h b/src/driver.h
index 52d7c32..3cfd499 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -1463,6 +1463,9 @@ typedef int (*virDevMonListDevices)(virConnectPtr conn,
char **const names,
int maxnames,
unsigned int flags);
+typedef int (*virDevMonListAllNodeDevices)(virConnectPtr conn,
+ virNodeDevicePtr **devices,
+ unsigned int flags);
typedef virNodeDevicePtr (*virDevMonDeviceLookupByName)(virConnectPtr conn,
const char *name);
@@ -1496,6 +1499,7 @@ struct _virDeviceMonitor {
virDrvClose close;
virDevMonNumOfDevices numOfDevices;
virDevMonListDevices listDevices;
+ virDevMonListAllNodeDevices listAllNodeDevices;
virDevMonDeviceLookupByName deviceLookupByName;
virDevMonDeviceGetXMLDesc deviceGetXMLDesc;
virDevMonDeviceGetParent deviceGetParent;
diff --git a/src/libvirt.c b/src/libvirt.c
index 5e4ed0d..9fa76f3 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -13595,6 +13595,66 @@ error:
return -1;
}
+/**
+ * virConnectListAllNodeDevices:
+ * @conn: Pointer to the hypervisor connection.
+ * @devices: Pointer to a variable to store the array containing the node
+ * device objects or NULL if the list is not required (just returns
+ * number of node devices).
+ * @flags: bitwise-OR of virConnectListAllNodeDevices.
+ *
+ * Collect the list of node devices, and allocate an array to store those
+ * objects.
+ *
+ * Normally, all node devices are returned; however, @flags can be used to
+ * filter the results for a smaller list of targeted node devices. The valid
+ * flags are divided into groups, where each group contains bits that
+ * describe mutually exclusive attributes of a node device, and where all bits
+ * within a group describe all possible node devices.
+ *
+ * Only one group of the @flags is supported. It supports to filter the node
+ * devices by capability type.
+ *
+ * Returns the number of node devices found or -1 and sets @devices to NULL in
+ * case of error. On success, the array stored into @devices is guaranteed to
+ * have an extra allocated element set to NULL but not included in the return
+ * count, to make iteration easier. The caller is responsible for calling
+ * virNodeDeviceFree() on each array element, then calling free() on
+ * @devices.
+ */
+int
+virConnectListAllNodeDevices(virConnectPtr conn,
+ virNodeDevicePtr **devices,
+ unsigned int flags)
+{
+ VIR_DEBUG("conn=%p, devices=%p, flags=%x", conn, devices, flags);
+
+ virResetLastError();
+
+ if (devices)
+ *devices = NULL;
+
+ if (!VIR_IS_CONNECT(conn)) {
+ virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__);
+ virDispatchError(NULL);
+ return -1;
+ }
+
+ if (conn->deviceMonitor &&
+ conn->deviceMonitor->listAllNodeDevices) {
+ int ret;
+ ret = conn->deviceMonitor->listAllNodeDevices(conn, devices, flags);
+ if (ret < 0)
+ goto error;
+ return ret;
+ }
+
+ virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
+
+error:
+ virDispatchError(conn);
+ return -1;
+}
/**
* virNodeListDevices:
@@ -13606,6 +13666,8 @@ error:
*
* Collect the list of node devices, and store their names in @names
*
+ * For more control over the results, see virConnectListAllNodeDevices().
+ *
* If the optional 'cap' argument is non-NULL, then the count
* will be restricted to devices with the specified capability
*
diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index 7d797e8..05b32ee 100644
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -553,6 +553,7 @@ LIBVIRT_0.10.0 {
virStoragePoolListAllVolumes;
virConnectListAllNetworks;
virConnectListAllInterfaces;
+ virConnectListAllNodeDevices;
} LIBVIRT_0.9.13;
# .... define new API here using predicted next version number ....
--
1.7.7.3