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

[Boris Fiuczynski]

Reviewed-by: Boris Fiuczynski <fiuczy at linux.ibm.com>

On 7/17/19 4:03 PM, Collin Walling wrote:
> This capability enables CPU model comparison between two CPU
> definitions via QMP.
> 
> Signed-off-by: Collin Walling <walling at linux.ibm.com>
> Reviewed-by: Daniel Henrique Barboza <danielh413 at gmail.com>
> ---
>   src/qemu/qemu_capabilities.c                     | 2 ++
>   src/qemu/qemu_capabilities.h                     | 1 +
>   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 +
>   tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml  | 1 +
>   9 files changed, 10 insertions(+)
> 
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index ab337fa..a99ebcb 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -537,6 +537,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
>                 /* 335 */
>                 "bochs-display",
>                 "query-cpu-model-baseline",
> +              "query-cpu-model-comparison",
>       );
>   
>   
> @@ -983,6 +984,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
>       { "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE },
>       { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE },
>       { "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 b49c0b9..8afa05c 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -518,6 +518,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
>       /* 335 */
>       QEMU_CAPS_DEVICE_BOCHS_DISPLAY, /* -device bochs-display */
>       QEMU_CAPS_QUERY_CPU_MODEL_BASELINE, /* qmp query-cpu-model-baseline */
> +    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>
> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
> index e72f447..8c8dc68 100644
> --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
> +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
> @@ -132,6 +132,7 @@
>     <flag name='bitmap-merge'/>
>     <flag name='nbd-bitmap'/>
>     <flag name='query-cpu-model-baseline'/>
> +  <flag name='query-cpu-model-comparison'/>
>     <version>4000000</version>
>     <kvmVersion>0</kvmVersion>
>     <microcodeVersion>39100758</microcodeVersion>
> 


-- 
Mit freundlichen Grüßen/Kind regards
    Boris Fiuczynski

IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Matthias Hartmann
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294