Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com>
---
tools/virsh-host.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
tools/virsh.pod | 5 +++++
2 files changed, 59 insertions(+)
diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index f69ab79..1d1bb97 100644
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -665,6 +665,54 @@ cmdURI(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
}
/*
+ * "cpu-models" command
+ */
+static const vshCmdInfo info_cpu_models[] = {
+ {.name = "help",
+ .data = N_("CPU models")
+ },
+ {.name = "desc",
+ .data = N_("Get the CPU models for an arch.")
+ },
+ {.name = NULL}
+};
+
+static const vshCmdOptDef opts_cpu_models[] = {
+ {.name = "arch",
+ .type = VSH_OT_DATA,
+ .flags = VSH_OFLAG_REQ,
+ .help = N_("architecture")
+ },
+ {.name = NULL}
+};
+
+static bool
+cmdCPUModelNames(vshControl *ctl, const vshCmd *cmd)
+{
+ char **models;
+ size_t i;
+ int nmodels;
+ const char *arch = NULL;
+
+ if (vshCommandOptStringReq(ctl, cmd, "arch", &arch) < 0)
+ return false;
+
+ nmodels = virConnectGetCPUModelNames(ctl->conn, arch, &models, 0);
+ if (nmodels < 0) {
+ vshError(ctl, "%s", _("failed to get CPU model names"));
+ return false;
+ }
+
+ for (i = 0; i < nmodels; i++) {
+ vshPrint(ctl, "%s\n", models[i]);
+ VIR_FREE(models[i]);
+ }
+ VIR_FREE(models);
+
+ return true;
+}
+
+/*
* "version" command
*/
static const vshCmdInfo info_version[] = {
@@ -889,6 +937,12 @@ const vshCmdDef hostAndHypervisorCmds[] = {
.info = info_capabilities,
.flags = 0
},
+ {.name = "cpu-models",
+ .handler = cmdCPUModelNames,
+ .opts = opts_cpu_models,
+ .info = info_cpu_models,
+ .flags = 0
+ },
{.name = "freecell",
.handler = cmdFreecell,
.opts = opts_freecell,
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 2864f3d..e12a800 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -163,6 +163,7 @@ group as an option. For example:
Host and Hypervisor (help keyword 'host'):
capabilities capabilities
+ cpu-models show the CPU models for an architecture
connect (re)connect to hypervisor
freecell NUMA free memory
hostname print the hypervisor hostname
@@ -358,6 +359,10 @@ current domain is in.
=over 4
+=item B<cpu-models> I<arch>
+
+Print the list of CPU models known for the specified architecture.
+
=item B<running>
The domain is currently running on a CPU
--
1.8.3.1