[libvirt] [PATCH 4/9] tests: domain capabilities: qemu 2.7 and 2.8 on s390x

[Jiri Denemark]

On Sun, Dec 18, 2016 at 14:22:24 -0500, Jason J. Herne wrote:
> From: "Collin L. Walling" <walling at linux.vnet.ibm.com>
> 
> Tests domain capabilities on s390x using the Qemu 2.8 capabilities data.
> 
> Signed-off-by: Collin L. Walling <walling at linux.vnet.ibm.com>
> Signed-off-by: Jason J. Herne <jjherne at linux.vnet.ibm.com>
> ---
>  tests/domaincapsschemadata/qemu_2.7.0.s390x.xml |  80 +++++++++++++
>  tests/domaincapsschemadata/qemu_2.8.0.s390x.xml | 144 ++++++++++++++++++++++++
>  tests/domaincapstest.c                          |  18 +++
>  3 files changed, 242 insertions(+)
>  create mode 100644 tests/domaincapsschemadata/qemu_2.7.0.s390x.xml
>  create mode 100644 tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
> 
> diff --git a/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml
> new file mode 100644
> index 0000000..9f181d3
> --- /dev/null
> +++ b/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml
> @@ -0,0 +1,80 @@
...
> +  <cpu>
> +    <mode name='host-passthrough' supported='yes'/>
> +    <mode name='host-model' supported='yes'>
> +      <model fallback='allow'></model>
> +    </mode>

This should be <mode name='host-model' supported='no'/>

...
> diff --git a/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
> new file mode 100644
> index 0000000..0b792b2
> --- /dev/null
> +++ b/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
> @@ -0,0 +1,144 @@
...
> +  <cpu>
> +    <mode name='host-passthrough' supported='yes'/>
> +    <mode name='host-model' supported='yes'>
> +      <model fallback='allow'></model>
> +    </mode>

And the same applies here.

...
> diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
> index fea5120..6b8bd2e 100644
> --- a/tests/domaincapstest.c
> +++ b/tests/domaincapstest.c
> @@ -134,6 +134,12 @@ static virCPUDef x86Cpu = {
>      NULL, 0, NULL, 1, 1, 1, 0, 0, NULL,
>  };
>  
> +static virCPUDef s390Cpu = {
> +    VIR_CPU_TYPE_HOST, 0, 0,
> +    VIR_ARCH_S390X, (char *) "",

And both issues are caused by this "". Using NULL instead fixes them.

> +    NULL, 0, NULL, 1, 1, 1, 0, 0, NULL,
> +};
> +

ACK with the suggested changes.

Jirka