[libvirt] [PATCH v3 17/17] qemu: domcaps: Report disk <enum name="model">

[Andrea Bolognani]

On Fri, 2019-02-08 at 17:12 -0500, Cole Robinson wrote:
> This generates new XML like:
> 
>     <disk>
>       <enum name='model'>
>         <value>virtio</value>
>         <value>virtio-transitional</value>
>         <value>virtio-non-transitional</value>
>       </enum>
>     </disk>
> 
> Signed-off-by: Cole Robinson <crobinso at redhat.com>
> ---
>  src/conf/domain_capabilities.c                |   1 +
>  src/conf/domain_capabilities.h                |   1 +
>  src/qemu/qemu_capabilities.c                  |  10 ++
>  .../bhyve_basic.x86_64.xml                    |   1 +
>  .../bhyve_fbuf.x86_64.xml                     |   1 +
>  .../bhyve_uefi.x86_64.xml                     |   1 +
>  tests/domaincapsschemadata/full.xml           |   6 +
>  .../domaincapsschemadata/libxl-xenfv-usb.xml  |   1 +
>  .../domaincapsschemadata/libxl-xenpv-usb.xml  |   1 +
>  .../qemu_1.7.0.x86_64.xml                     |   3 +
>  .../qemu_2.12.0-virt.aarch64.xml              |   5 +
>  .../qemu_2.12.0.ppc64.xml                     |   5 +
>  .../qemu_2.12.0.s390x.xml                     |   5 +
>  .../qemu_2.12.0.x86_64.xml                    |   5 +
>  .../qemu_2.6.0-virt.aarch64.xml               |   5 +
>  .../qemu_2.6.0.aarch64.xml                    |   5 +
>  .../domaincapsschemadata/qemu_2.6.0.ppc64.xml |   5 +
>  .../qemu_2.6.0.x86_64.xml                     |   5 +
>  .../domaincapsschemadata/qemu_2.7.0.s390x.xml |   5 +
>  .../qemu_2.8.0-tcg.x86_64.xml                 |   5 +
>  .../domaincapsschemadata/qemu_2.8.0.s390x.xml |   5 +
>  .../qemu_2.8.0.x86_64.xml                     |   5 +
>  .../qemu_2.9.0-q35.x86_64.xml                 |   5 +
>  .../qemu_2.9.0-tcg.x86_64.xml                 |   5 +
>  .../qemu_2.9.0.x86_64.xml                     |   5 +
>  .../domaincapsschemadata/qemu_3.0.0.s390x.xml |   5 +
>  .../qemu_4.0.0.x86_64.xml                     | 153 ++++++++++++++++++
>  tests/domaincapstest.c                        |   4 +
>  28 files changed, 263 insertions(+)
>  create mode 100644 tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml

This did not apply correctly for me on top of 1620bb0a3050373d059b0,
but after regenerating output files the resulting diff looks sane
enough so I'll assume everything is fine and you'll take care of it
before pushing anyway.

[...]
> +++ b/src/conf/domain_capabilities.h
> @@ -65,6 +65,7 @@ struct _virDomainCapsDeviceDisk {
>      bool supported;
>      virDomainCapsEnum diskDevice;   /* Info about virDomainDiskDevice enum values */
>      virDomainCapsEnum bus;          /* Info about virDomainDiskBus enum values */
> +    virDomainCapsEnum model;   /* Info about virDomainDiskModel enum values */
>      /* add new fields here */
>  };

Might as well keep those comments aligned...

[...]
> +++ b/tests/domaincapstest.c
> @@ -94,6 +94,7 @@ fillAllCaps(virDomainCapsPtr domCaps)
>      disk->supported = true;
>      SET_ALL_BITS(disk->diskDevice);
>      SET_ALL_BITS(disk->bus);
> +    SET_ALL_BITS(disk->model);
>  
>      graphics->supported = true;
>      SET_ALL_BITS(graphics->type);
> @@ -502,6 +503,9 @@ mymain(void)
>                   "/usr/bin/qemu-system-s390x", NULL,
>                   "s390x", VIR_DOMAIN_VIRT_KVM);
>  
> +    DO_TEST_QEMU("4.0.0", "caps_4.0.0",
> +                 "/usr/bin/qemu-system-x86_64", NULL,
> +                 "x86_64", VIR_DOMAIN_VIRT_KVM);

As mentioned during the previous rounf of reviews, this hunk (and
the resulting output file) belong in a separate patch. Please make
ure you split these unrelated changes off before pushing.

With that addressed,

  Reviewed-by: Andrea Bolognani <abologna at redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization