[libvirt] [PATCH v2 6/8] qemu_capabilities: introduce QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON

[Daniel Henrique Barboza]

On 4/26/19 5:22 PM, walling at linux.ibm.com wrote:
> From: Collin Walling <walling at linux.ibm.com>
>
> This capability enables CPU model comparison between two CPU
> definitions via QMP.
>
> Signed-off-by: Collin Walling <walling at linux.ibm.com>
> Tested-by: Daniel Henrique Barboza <danielhb413 at gmail.com>

Reviewed-by: Daniel Henrique Barboza <danielhb413 at gmail.com>


> ---
>   src/qemu/qemu_capabilities.c                     | 4 ++++
>   src/qemu/qemu_capabilities.h                     | 3 +++
>   tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 +
>   tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 +
>   tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 +
>   tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml  | 1 +
>   tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml  | 1 +
>   tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml  | 1 +
>   8 files changed, 13 insertions(+)
>
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index e3f3d0b..374a7c1 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -526,6 +526,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
>                 "overcommit",
>                 "query-current-machine",
>                 "query-cpu-model-baseline",
> +
> +              /* 330 */
> +              "query-cpu-model-comparison",
>       );
>   
>   
> @@ -973,6 +976,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
>       { "blockdev-del", QEMU_CAPS_BLOCKDEV_DEL },
>       { "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE },
>       { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE },
> +    { "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON },
>   };
>   
>   struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
> diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> index 08fd555..47612e9 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -509,6 +509,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
>       QEMU_CAPS_QUERY_CURRENT_MACHINE, /* query-current-machine command */
>       QEMU_CAPS_QUERY_CPU_MODEL_BASELINE, /* qmp query-cpu-model-baseline */
>   
> +    /* 330 */
> +    QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON, /* qmp query-cpu-model-comparison */
> +
>       QEMU_CAPS_LAST /* this must always be the last item */
>   } virQEMUCapsFlags;
>   
> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
> index e6f7e28..058eb32 100644
> --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
> +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
> @@ -104,6 +104,7 @@
>     <flag name='zpci'/>
>     <flag name='iothread.poll-max-ns'/>
>     <flag name='query-cpu-model-baseline'/>
> +  <flag name='query-cpu-model-comparison'/>
>     <version>2010000</version>
>     <kvmVersion>0</kvmVersion>
>     <microcodeVersion>39100805</microcodeVersion>
> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
> index 48d7742..4256131 100644
> --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
> +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
> @@ -111,6 +111,7 @@
>     <flag name='zpci'/>
>     <flag name='iothread.poll-max-ns'/>
>     <flag name='query-cpu-model-baseline'/>
> +  <flag name='query-cpu-model-comparison'/>
>     <version>2011000</version>
>     <kvmVersion>0</kvmVersion>
>     <microcodeVersion>39100806</microcodeVersion>
> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
> index 381abd5..48be96d 100644
> --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
> +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
> @@ -122,6 +122,7 @@
>     <flag name='iothread.poll-max-ns'/>
>     <flag name='memory-backend-file.align'/>
>     <flag name='query-cpu-model-baseline'/>
> +  <flag name='query-cpu-model-comparison'/>
>     <version>2012000</version>
>     <kvmVersion>0</kvmVersion>
>     <microcodeVersion>39100807</microcodeVersion>
> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
> index 9516a3b..5b04416 100644
> --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
> +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
> @@ -93,6 +93,7 @@
>     <flag name='vhost-vsock'/>
>     <flag name='zpci'/>
>     <flag name='query-cpu-model-baseline'/>
> +  <flag name='query-cpu-model-comparison'/>
>     <version>2007093</version>
>     <kvmVersion>0</kvmVersion>
>     <microcodeVersion>39100764</microcodeVersion>
> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
> index cf8bbb2..d5feb7b 100644
> --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
> +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
> @@ -98,6 +98,7 @@
>     <flag name='zpci'/>
>     <flag name='iothread.poll-max-ns'/>
>     <flag name='query-cpu-model-baseline'/>
> +  <flag name='query-cpu-model-comparison'/>
>     <version>2009000</version>
>     <kvmVersion>0</kvmVersion>
>     <microcodeVersion>39100765</microcodeVersion>
> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
> index 40b4a2b..27befc4 100644
> --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
> +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
> @@ -124,6 +124,7 @@
>     <flag name='iothread.poll-max-ns'/>
>     <flag name='memory-backend-file.align'/>
>     <flag name='query-cpu-model-baseline'/>
> +  <flag name='query-cpu-model-comparison'/>
>     <version>3000000</version>
>     <kvmVersion>0</kvmVersion>
>     <microcodeVersion>39100757</microcodeVersion>