On Fri, Feb 07, 2020 at 03:27:02PM +0100, Andrea Bolognani wrote:
> We will use this capability to detect whether the QEMU binary
> supports the kvm-no-adjvtime CPU feature.
>
> Reviewed-by: Ján Tomko <jtomko@xxxxxxxxxx>
> Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
> ---
> src/qemu/qemu_capabilities.c | 2 ++
> src/qemu/qemu_capabilities.h | 1 +
> tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 +
> 3 files changed, 4 insertions(+)
>
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index dd2311cfa9..0e727093bc 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -559,6 +559,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
> "rng-builtin",
> "virtio-net.failover",
> "tpm-spapr",
> + "cpu.kvm-no-adjvtime",
> );
>
>
> @@ -1562,6 +1563,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendMemfd[]
>
> static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMaxCPU[] = {
> { "unavailable-features", QEMU_CAPS_CPU_UNAVAILABLE_FEATURES },
> + { "kvm-no-adjvtime", QEMU_CAPS_CPU_KVM_NO_ADJVTIME },
> };
>
> static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
> diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> index 2473e64654..e6c5725a76 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -541,6 +541,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
> QEMU_CAPS_OBJECT_RNG_BUILTIN, /* -object rng-builtin */
> QEMU_CAPS_VIRTIO_NET_FAILOVER, /* virtio-net-*.failover */
> QEMU_CAPS_DEVICE_TPM_SPAPR, /* -device tpm-spapr */
> + QEMU_CAPS_CPU_KVM_NO_ADJVTIME, /* -cpu ...,kvm-no-adjvtime */
>
> QEMU_CAPS_LAST /* this must always be the last item */
> } virQEMUCapsFlags;
> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
> index 538b40dd5b..c05cea2eb7 100644
> --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
> +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
> @@ -179,6 +179,7 @@
> <flag name='smp-dies'/>
> <flag name='rng-builtin'/>
> <flag name='virtio-net.failover'/>
> + <flag name='cpu.kvm-no-adjvtime'/>
> <version>4002050</version>
> <kvmVersion>0</kvmVersion>
> <microcodeVersion>61700241</microcodeVersion>
> --
> 2.24.1
>
Reviewed-by: Masayoshi Mizuma <m.mizuma@xxxxxxxxxxxxxx>
