On Thu, Feb 05, 2015 at 15:47:56 +0100, Ján Tomko wrote:
> Wire up VIR_CONNECT_BASELINE_CPU_MIGRATABLE to this
> command line option.
> ---
> tools/virsh-domain.c | 6 ++++++
> tools/virsh.pod | 5 +++--
> 2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
> index bab44fe..2b4f06d 100644
> --- a/tools/virsh-domain.c
> +++ b/tools/virsh-domain.c
> @@ -6860,6 +6860,10 @@ static const vshCmdOptDef opts_cpu_baseline[] = {
> .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}
> };
>
> @@ -6882,6 +6886,8 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd)
>
> 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)
> return false;
> diff --git a/tools/virsh.pod b/tools/virsh.pod
> index e367e04..3881614 100644
> --- a/tools/virsh.pod
> +++ b/tools/virsh.pod
> @@ -573,7 +573,7 @@ I<cellno> modifier can be used to narrow the modification down to
> a single host NUMA cell. On the other end of spectrum lies
> I<--all> which executes the modification on all NUMA cells.
>
> -=item B<cpu-baseline> I<FILE> [I<--features>]
> +=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
> @@ -582,7 +582,8 @@ 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.
> +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.
>
> =item B<cpu-compare> I<FILE> [I<--error>]
I understand two spaces after a dot which ends a sentence, but three
spaces seem to be more than enough :-)
ACK
Jirka
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list