5:23 p.m.
On 05/16/2018 04:39 AM, Jiri Denemark wrote:
This command is a virsh wrapper for virConnectBaselineHypervisorCPU.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
tools/virsh-host.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++
tools/virsh.pod | 47 ++++++++++++++++++++---
2 files changed, 137 insertions(+), 6 deletions(-)
diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index 1e7cfcbd5e..8fde5da50e 100644
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -1702,6 +1702,96 @@ cmdHypervisorCPUCompare(vshControl *ctl,
}
[...]
+
+static const vshCmdOptDef opts_hypervisor_cpu_baseline[] = {
+ VIRSH_COMMON_OPT_FILE(N_("file containing XML CPU descriptions")),
+ {.name = "virttype",
+ .type = VSH_OT_STRING,
+ .help = N_("virtualization type (/domain/@type)"),
+ },
+ {.name = "emulator",
+ .type = VSH_OT_STRING,
+ .help = N_("path to emulator binary (/domain/devices/emulator)"),
+ },
+ {.name = "arch",
+ .type = VSH_OT_STRING,
+ .help = N_("domain architecture (/domain/os/type/@arch)"),
"CPU architecture" again :)
[...]
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 1a55092efd..d57ebadee6 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -574,12 +574,13 @@ I<--all> which executes the modification on all NUMA cells.
=item B<cpu-baseline> I<FILE> [I<--features>] [I<--migratable>]
Compute baseline CPU which will be supported by all host CPUs given in <file>.
-The list of host CPUs is built by extracting all <cpu>
elements from the
-<file>. Thus, the <file> can contain either a set of <cpu> elements
separated
-by new lines or even a set of complete <capabilities> elements printed by
-B<capabilities> command. If I<--features> is specified then the
-resulting XML description will explicitly include all features that make
-up the CPU, without this option features that are part of the CPU model
+(See B<hypervisor-cpu-baseline> command to get a CPU which can
be provided by a
+specific hypervisor.) The list of host CPUs is built by extracting all <cpu>
+elements from the <file>. Thus, the <file> can contain either a set of
<cpu>
+elements separated by new lines or even a set of complete <capabilities>
+elements printed by B<capabilities> command. If I<--features> is specified
comma after "specified"
+then the resulting XML description will explicitly include all
features that
+make up the CPU, without this option features that are part of the CPU model
will not be listed in the XML description. If I<--migratable> is specified,
features that block migration will not be included in the resulting CPU.
@@ -643,6 +644,40 @@ I<machine> specifies the machine type. If I<--error> is
specified, the command
will return an error when the given CPU is incompatible with host CPU and a
message providing more details about the incompatibility will be printed out.
+=item B<hypervisor-cpu-baseline> I<FILE> [I<virttype>]
[I<emulator>] [I<arch>]
+[I<machine>] [I<--features>] [I<--migratable>]
+
+Compute baseline CPU which will be compatible with all CPUs given in I<FILE>
+and can be provided by the specified hypervisor. (This is different from
Borrowing some ideas from your documentation on comparison:
"Compute a baseline CPU which will be compatible with all CPUs defined in an
XML I<file> and with the CPU the hypervisor is able to provide on the host.
(This is different from"
+B<cpu-baseline> which does not consider any hypervisor
abilities when computing
+the baseline CPU.)
+
+The XML I<FILE> may contain either host or guest CPU definitions describing the
+host CPU model. The host CPU definition is the <cpu> element and its contents
+as printed by B<capabilities> command. The guest CPU definition may be created
+from the host CPU model found in domain capabilities XML (printed by
+B<domcapabilities> command). In addition to the <cpu> elements, this
command
+accepts full capabilities XMLs, or domain capabilities XMLs containing the CPU
+definitions. For best results, use only the CPU definitions from domain
+capabilities.
+
+When I<FILE> contains only a single CPU definition, the command will print the
+same CPU updated according to additional options and restricted to the
+capabilities of the specified hypervisor. Specifically, running
My head got wrapped around trying to understand what this sentence, specifically
what is meant by "additional options". I assume you're referring to the
--features
and --migratable options?
How about something like this:
"When I<FILE> contains only a single CPU definition, the command will print
the
same CPU with restrictions imposed by the capabilities of the hypervisor."
and then leave it up to your description of the additional options in your last
paragraph to explain how to print the features?
"Specifically, running the"
+B<virsh hypervisor-cpu-baseline> command with no additional
options on the
+result of B<virsh domcapabilities> will return transform the host CPU model
I would remove "return" from this sentence.
+from domain capabilities XML to the form directly usable in domain
XML.
"from domain capabilities XML to _a_ form directly usable in the domain XML."
+
+The I<virttype> option specifies the virtualization type (usable in the
'type'
+attribute of the <domain> top level element from the domain XML).
I<emulator>
+specifies the path to the emulator, I<arch> specifies the CPU architecture, and
+I<machine> specifies the machine type. If I<--features> is specified then
the
+resulting XML description will explicitly include all features that make up the
+CPU, without this option features that are part of the CPU model will not be
+listed in the XML description. If I<--migratable> is specified, features that
+block migration will not be included in the resulting CPU.
+
+
=back
=head1 DOMAIN COMMANDS
--
Respectfully,
- Collin Walling