mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-04 00:52:37 +00:00
virsh: Introduce new hypervisor-cpu-baseline command
This command is a virsh wrapper for virConnectBaselineHypervisorCPU. Signed-off-by: Jiri Denemark <jdenemar@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark
parent
e60210345a
commit
6d27148ae1
|
|
@ -1707,6 +1707,96 @@ cmdHypervisorCPUCompare(vshControl *ctl,
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
* "hypervisor-cpu-baseline" command
|
||||
*/
|
||||
static const vshCmdInfo info_hypervisor_cpu_baseline[] = {
|
||||
{.name = "help",
|
||||
.data = N_("compute baseline CPU usable by a specific hypervisor")
|
||||
},
|
||||
{.name = "desc",
|
||||
.data = N_("Compute baseline CPU for a set of given CPUs. The result "
|
||||
"will be tailored to the specified hypervisor.")
|
||||
},
|
||||
{.name = NULL}
|
||||
};
|
||||
|
||||
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_("CPU architecture (/domain/os/type/@arch)"),
|
||||
},
|
||||
{.name = "machine",
|
||||
.type = VSH_OT_STRING,
|
||||
.help = N_("machine type (/domain/os/type/@machine)"),
|
||||
},
|
||||
{.name = "features",
|
||||
.type = VSH_OT_BOOL,
|
||||
.help = N_("Show features that are part of the CPU model type")
|
||||
},
|
||||
{.name = "migratable",
|
||||
.type = VSH_OT_BOOL,
|
||||
.help = N_("Do not include features that block migration")
|
||||
},
|
||||
{.name = NULL}
|
||||
};
|
||||
|
||||
static bool
|
||||
cmdHypervisorCPUBaseline(vshControl *ctl,
|
||||
const vshCmd *cmd)
|
||||
{
|
||||
const char *from = NULL;
|
||||
const char *virttype = NULL;
|
||||
const char *emulator = NULL;
|
||||
const char *arch = NULL;
|
||||
const char *machine = NULL;
|
||||
bool ret = false;
|
||||
char *result = NULL;
|
||||
char **list = NULL;
|
||||
unsigned int flags = 0;
|
||||
virshControlPtr priv = ctl->privData;
|
||||
|
||||
if (vshCommandOptBool(cmd, "features"))
|
||||
flags |= VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES;
|
||||
if (vshCommandOptBool(cmd, "migratable"))
|
||||
flags |= VIR_CONNECT_BASELINE_CPU_MIGRATABLE;
|
||||
|
||||
if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0 ||
|
||||
vshCommandOptStringReq(ctl, cmd, "virttype", &virttype) < 0 ||
|
||||
vshCommandOptStringReq(ctl, cmd, "emulator", &emulator) < 0 ||
|
||||
vshCommandOptStringReq(ctl, cmd, "arch", &arch) < 0 ||
|
||||
vshCommandOptStringReq(ctl, cmd, "machine", &machine) < 0)
|
||||
return false;
|
||||
|
||||
if (!(list = vshExtractCPUDefXMLs(ctl, from)))
|
||||
return false;
|
||||
|
||||
result = virConnectBaselineHypervisorCPU(priv->conn, emulator, arch,
|
||||
machine, virttype,
|
||||
(const char **)list,
|
||||
virStringListLength((const char **)list),
|
||||
flags);
|
||||
|
||||
if (result) {
|
||||
vshPrint(ctl, "%s", result);
|
||||
ret = true;
|
||||
}
|
||||
|
||||
VIR_FREE(result);
|
||||
virStringListFree(list);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
const vshCmdDef hostAndHypervisorCmds[] = {
|
||||
{.name = "allocpages",
|
||||
.handler = cmdAllocpages,
|
||||
|
|
@ -1762,6 +1852,12 @@ const vshCmdDef hostAndHypervisorCmds[] = {
|
|||
.info = info_hostname,
|
||||
.flags = 0
|
||||
},
|
||||
{.name = "hypervisor-cpu-baseline",
|
||||
.handler = cmdHypervisorCPUBaseline,
|
||||
.opts = opts_hypervisor_cpu_baseline,
|
||||
.info = info_hypervisor_cpu_baseline,
|
||||
.flags = 0
|
||||
},
|
||||
{.name = "hypervisor-cpu-compare",
|
||||
.handler = cmdHypervisorCPUCompare,
|
||||
.opts = opts_hypervisor_cpu_compare,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
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.
|
||||
|
||||
|
|
@ -644,6 +645,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 the 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 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 with restrictions imposed by the capabilities of the hypervisor.
|
||||
Specifically, running th B<virsh hypervisor-cpu-baseline> command with no
|
||||
additional options on the result of B<virsh domcapabilities> will transform the
|
||||
host CPU model from domain capabilities XML to a form directly usable in 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
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user