This patch contains virsh support for node device enumeration.
diff --git a/src/virsh.c b/src/virsh.c
index 89aa4fa..67963f0 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -4415,6 +4415,83 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
}
/*
+ * "node-list-devices" command
+ */
+static const vshCmdInfo info_node_list_devices[] = {
+ {"syntax", "node-list-devices"},
+ {"help", gettext_noop("enumerate devices on this host")},
+ {NULL, NULL}
+};
+
+static int
+cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
+{
+ char **devices;
+ int num_devices, i;
+
+ if (!vshConnectionUsability(ctl, ctl->conn, TRUE))
+ return FALSE;
+
+ num_devices = virNodeNumOfDevices(ctl->conn, 0);
+ if (num_devices < 0) {
+ vshError(ctl, FALSE, "%s", _("Failed to count node devices"));
+ return FALSE;
+ } else if (num_devices == 0) {
+ return TRUE;
+ }
+
+ devices = vshMalloc(ctl, sizeof(char *) * num_devices);
+ num_devices = virNodeListDevices(ctl->conn, devices, num_devices, 0);
+ if (num_devices < 0) {
+ vshError(ctl, FALSE, "%s", _("Failed to list node devices"));
+ free(devices);
+ return FALSE;
+ }
+ for (i = 0; i < num_devices; i++) {
+ vshPrint(ctl, "%s\n", devices[i]);
+ free(devices[i]);
+ }
+ free(devices);
+ return TRUE;
+}
+
+/*
+ * "node-device-dumpxml" command
+ */
+static const vshCmdInfo info_node_device_dumpxml[] = {
+ {"syntax", "node-device-dumpxml <device>"},
+ {"help", gettext_noop("node device details in XML")},
+ {"desc", gettext_noop("Output the node device details as an XML dump to stdout.")},
+ {NULL, NULL}
+};
+
+
+static const vshCmdOptDef opts_node_device_dumpxml[] = {
+ {"device", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("device key")},
+ {NULL, 0, 0, NULL}
+};
+
+static int
+cmdNodeDeviceDumpXML (vshControl *ctl, const vshCmd *cmd)
+{
+ const char *name;
+ virNodeDevicePtr device;
+
+ if (!vshConnectionUsability(ctl, ctl->conn, TRUE))
+ return FALSE;
+ if (!(name = vshCommandOptString(cmd, "device", NULL)))
+ return FALSE;
+ if (!(device = virNodeDeviceLookupByName(ctl->conn, name))) {
+ vshError(ctl, FALSE, "%s '%s'", _("Could not find matching device"), name);
+ return FALSE;
+ }
+
+ vshPrint(ctl, "%s\n", virNodeDeviceGetXMLDesc(device, 0));
+ virNodeDeviceFree(device);
+ return TRUE;
+}
+
+/*
* "hostkey" command
*/
static const vshCmdInfo info_hostname[] = {
@@ -5566,6 +5643,9 @@ static const vshCmdDef commands[] = {
{"net-uuid", cmdNetworkUuid, opts_network_uuid, info_network_uuid},
{"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo},
+ {"node-list-devices", cmdNodeListDevices, NULL, info_node_list_devices},
+ {"node-device-dumpxml", cmdNodeDeviceDumpXML, opts_node_device_dumpxml, info_node_device_dumpxml},
+
{"pool-autostart", cmdPoolAutostart, opts_pool_autostart, info_pool_autostart},
{"pool-build", cmdPoolBuild, opts_pool_build, info_pool_build},
{"pool-create", cmdPoolCreate, opts_pool_create, info_pool_create},
--
Libvir-list mailing list
Libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
