[libvirt] [PATCH 02/11] qemu_capabilities: join capabilities for qxl and qxl-vga devices

[John Ferlan]

On 09/30/2016 12:02 PM, Pavel Hrdina wrote:
> This patch simplifies QEMU capabilities for QXL video device.  QEMU
> exposes this device as *qxl-vga* and *qxl* and they are both the same
> device with the same set of parameters, the only difference is that
> *qxl-vga* includes VGA compatibility.
> 
> Based on QEMU code they are tied together so it's safe to check only for
> presence of only one of them.
> 
> This patch also removes an invalid test case "video-qxl-sec-nodevice"
> where there is only *qxl-vga* device and *qxl* device is not present.
> 
> Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
> ---
>  src/qemu/qemu_capabilities.c                       |  12 +--
>  src/qemu/qemu_capabilities.h                       |   8 +-
>  src/qemu/qemu_command.c                            |  21 ++--
>  src/qemu/qemu_process.c                            |   4 +-
>  .../qemu_2.6.0-gicv2-virt.aarch64.xml              |   1 -
>  .../qemu_2.6.0-gicv3-virt.aarch64.xml              |   1 -
>  tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml  |   1 -
>  tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml  |   1 -
>  .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies |  92 +++---------------
>  tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml   |   3 -
>  .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies |  96 +++---------------
>  tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml   |   3 -
>  .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies |  96 +++---------------
>  tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml   |   3 -
>  .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies |  96 +++---------------
>  tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml   |   3 -
>  .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies |  96 +++---------------
>  tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml   |   3 -
>  .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies |  96 +++---------------
>  tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml   |   3 -
>  .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies |  96 +++---------------
>  tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml   |   3 -
>  .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 103 +++-----------------
>  tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml   |   4 -
>  .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 103 +++-----------------
>  tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml   |   4 -
>  .../caps_2.6.0-gicv2.aarch64.replies               |   8 --
>  .../caps_2.6.0-gicv2.aarch64.xml                   |   1 -
>  .../caps_2.6.0-gicv3.aarch64.replies               |   8 --
>  .../caps_2.6.0-gicv3.aarch64.xml                   |   1 -
>  .../caps_2.6.0.ppc64le.replies                     |   8 --
>  tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml  |   1 -
>  .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 103 +++-----------------
>  tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml   |   4 -
>  .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 108 +++------------------
>  tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml   |   4 -
>  tests/qemuhelptest.c                               |   2 -
>  .../qemuxml2argv-video-qxl-sec-nodevice.xml        |  32 ------
>  tests/qemuxml2argvtest.c                           |  51 ++++------
>  tests/qemuxml2xmltest.c                            |  18 ++--
>  40 files changed, 185 insertions(+), 1116 deletions(-)
>  delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-nodevice.xml
> 

Changes seem reasonable, ACK

John