Without spice graphics non of the spicevmc, spiceport and spice audiodev do not make sense. We could also check if the QEMU supports spice, but that check would be a redundant check, which is redundant. Martin Kletzander (4): Remove serial-spiceport-nospice test tests: Adjust for invalid qemu command combinations conf: Add virDomainDefHasSpiceGraphics qemu: Disable spice-related devices without spice graphics src/conf/domain_conf.c | 14 ++++++ src/conf/domain_conf.h | 3 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_validate.c | 34 ++++++++++---- .../audio-spice-best.x86_64-4.1.0.args | 3 +- .../audio-spice-best.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/audio-spice-best.xml | 7 +++ .../audio-spice-full.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/audio-spice-full.xml | 7 +++ .../audio-spice-minimal.x86_64-4.1.0.args | 3 +- .../audio-spice-minimal.x86_64-latest.args | 3 +- .../qemuxml2argvdata/audio-spice-minimal.xml | 7 +++ .../channel-virtio-default.args | 9 ++-- .../channel-virtio-default.xml | 1 + .../serial-spiceport-nospice.args | 33 ------------- ...erial-spiceport-nospice.x86_64-latest.args | 37 --------------- .../serial-spiceport-nospice.xml | 37 --------------- .../smartcard-passthrough-spicevmc.args | 7 +-- .../smartcard-passthrough-spicevmc.xml | 1 + tests/qemuxml2argvdata/usb-redir-boot.args | 7 +-- tests/qemuxml2argvdata/usb-redir-boot.xml | 1 + .../usb-redir-filter-version.args | 7 +-- .../usb-redir-filter-version.xml | 1 + tests/qemuxml2argvdata/usb-redir-filter.args | 7 +-- tests/qemuxml2argvdata/usb-redir-filter.xml | 1 + tests/qemuxml2argvdata/usb-redir.args | 7 +-- tests/qemuxml2argvdata/usb-redir.xml | 1 + tests/qemuxml2argvtest.c | 21 +++++---- .../serial-spiceport-nospice.xml | 47 ------------------- .../smartcard-passthrough-spicevmc.xml | 11 ++++- .../usb-redir-filter-version.xml | 11 ++++- tests/qemuxml2xmloutdata/usb-redir-filter.xml | 11 ++++- tests/qemuxml2xmloutdata/usb-redir.xml | 11 ++++- tests/qemuxml2xmltest.c | 31 ++++++++---- 34 files changed, 178 insertions(+), 210 deletions(-) delete mode 100644 tests/qemuxml2argvdata/serial-spiceport-nospice.args delete mode 100644 tests/qemuxml2argvdata/serial-spiceport-nospice.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/serial-spiceport-nospice.xml delete mode 100644 tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml -- 2.35.1
