[PATCH 0/5] qemu: Clean up and fix corner case in 'max_outputs'/heads handling

[Peter Krempa]

Peter Krempa (5):
  qemuBuildDeviceVideoCmd: Always assume support for 'max_outputs'
    property
  qemu: capabilities: Retire QEMU_CAPS_QXL_MAX_OUTPUTS and
    QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS
  qemuBuildDeviceVideoCmd: Simplify formatting of 'max_outputs' property
  qemuValidateDomainDeviceDefVideo: Refactor condition checking for qxl
    and virtio-vga
  qemuValidateDomainDeviceDefVideo: Reject non-default video head count
    for devices not supporting it

 src/qemu/qemu_capabilities.c                  |  6 ++---
 src/qemu/qemu_capabilities.h                  |  4 ++--
 src/qemu/qemu_command.c                       | 24 +++++--------------
 src/qemu/qemu_validate.c                      | 21 ++++++++++------
 .../caps_2.11.0.s390x.xml                     |  1 -
 .../caps_2.11.0.x86_64.xml                    |  2 --
 .../caps_2.12.0.aarch64.xml                   |  1 -
 .../caps_2.12.0.ppc64.xml                     |  1 -
 .../caps_2.12.0.s390x.xml                     |  1 -
 .../caps_2.12.0.x86_64.xml                    |  2 --
 .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml |  1 -
 .../caps_3.0.0.riscv32.xml                    |  1 -
 .../caps_3.0.0.riscv64.xml                    |  1 -
 .../qemucapabilitiesdata/caps_3.0.0.s390x.xml |  1 -
 .../caps_3.0.0.x86_64.xml                     |  2 --
 .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |  1 -
 .../caps_3.1.0.x86_64.xml                     |  2 --
 .../caps_4.0.0.aarch64.xml                    |  1 -
 .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |  1 -
 .../caps_4.0.0.riscv32.xml                    |  1 -
 .../caps_4.0.0.riscv64.xml                    |  1 -
 .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |  1 -
 .../caps_4.0.0.x86_64.xml                     |  2 --
 .../caps_4.1.0.x86_64.xml                     |  2 --
 .../caps_4.2.0.aarch64.xml                    |  1 -
 .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |  1 -
 .../qemucapabilitiesdata/caps_4.2.0.s390x.xml |  1 -
 .../caps_4.2.0.x86_64.xml                     |  2 --
 .../caps_5.0.0.aarch64.xml                    |  1 -
 .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |  1 -
 .../caps_5.0.0.riscv64.xml                    |  1 -
 .../caps_5.0.0.x86_64.xml                     |  2 --
 .../caps_5.1.0.x86_64.xml                     |  2 --
 .../caps_5.2.0.aarch64.xml                    |  1 -
 .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |  1 -
 .../caps_5.2.0.riscv64.xml                    |  1 -
 .../qemucapabilitiesdata/caps_5.2.0.s390x.xml |  1 -
 .../caps_5.2.0.x86_64.xml                     |  2 --
 .../caps_6.0.0.aarch64.xml                    |  1 -
 .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |  1 -
 .../caps_6.0.0.x86_64.xml                     |  2 --
 .../caps_6.1.0.x86_64.xml                     |  2 --
 .../caps_6.2.0.aarch64.xml                    |  1 -
 .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml |  1 -
 .../caps_6.2.0.x86_64.xml                     |  2 --
 .../caps_7.0.0.x86_64.xml                     |  2 --
 .../aarch64-video-default.args                |  2 +-
 .../aarch64-video-virtio-gpu-pci.args         |  2 +-
 ...s-spice-agent-file-xfer.x86_64-latest.args |  4 ++--
 ...phics-spice-compression.x86_64-latest.args |  4 ++--
 ...hics-spice-egl-headless.x86_64-latest.args |  2 +-
 .../graphics-spice-qxl-vga.x86_64-latest.args |  4 ++--
 .../graphics-spice-sasl.x86_64-latest.args    |  2 +-
 .../graphics-spice.x86_64-latest.args         |  4 ++--
 ...tdev-mdev-display-ramfb.x86_64-latest.args |  2 +-
 ...play-spice-egl-headless.x86_64-latest.args |  2 +-
 ...ev-display-spice-opengl.x86_64-latest.args |  2 +-
 ...isplay-vnc-egl-headless.x86_64-latest.args |  2 +-
 ...ostdev-mdev-display-vnc.x86_64-latest.args |  2 +-
 tests/qemuxml2argvdata/pcie-root-port.args    |  2 +-
 .../pcie-switch-downstream-port.args          |  2 +-
 .../pcie-switch-upstream-port.args            |  2 +-
 tests/qemuxml2argvdata/pcihole64-q35.args     |  2 +-
 tests/qemuxml2argvdata/q35-pcie-autoadd.args  |  2 +-
 tests/qemuxml2argvdata/q35-pcie.args          |  2 +-
 tests/qemuxml2argvdata/q35-usb2-multi.args    |  2 +-
 tests/qemuxml2argvdata/q35-usb2-reorder.args  |  2 +-
 tests/qemuxml2argvdata/q35-usb2.args          |  2 +-
 .../q35-virt-manager-basic.args               |  2 +-
 tests/qemuxml2argvdata/q35-virtio-pci.args    |  2 +-
 tests/qemuxml2argvdata/q35.args               |  2 +-
 tests/qemuxml2argvdata/serial-spiceport.args  |  2 +-
 .../serial-spiceport.x86_64-latest.args       |  2 +-
 .../video-device-pciaddr-default.args         |  6 ++---
 .../video-qxl-device-vgamem.args              |  2 +-
 ...video-qxl-device-vram64.x86_64-latest.args |  2 +-
 tests/qemuxml2argvdata/video-qxl-device.args  |  2 +-
 tests/qemuxml2argvdata/video-qxl-heads.args   |  6 ++---
 tests/qemuxml2argvdata/video-qxl-noheads.args |  2 +-
 .../video-qxl-resolution.args                 |  2 +-
 .../video-qxl-sec-device-vgamem.args          |  4 ++--
 ...o-qxl-sec-device-vram64.x86_64-latest.args |  4 ++--
 .../video-qxl-sec-device.args                 |  4 ++--
 .../qemuxml2argvdata/video-vga-qxl-heads.args |  6 ++---
 .../video-virtio-gpu-device.args              |  2 +-
 .../video-virtio-gpu-sdl-gl.args              |  2 +-
 .../video-virtio-gpu-secondary.args           |  4 ++--
 .../video-virtio-gpu-spice-gl.args            |  2 +-
 .../video-virtio-gpu-virgl.args               |  2 +-
 .../x86_64-pc-graphics.x86_64-latest.args     |  2 +-
 .../x86_64-q35-graphics.x86_64-latest.args    |  2 +-
 tests/qemuxml2argvtest.c                      | 16 ++++---------
 tests/qemuxml2xmltest.c                       |  2 --
 93 files changed, 87 insertions(+), 160 deletions(-)

-- 
2.34.1