From: Jonathon Jongsma <jjongsma@redhat.com>
Date: Fri, 13 Sep 2019 21:20:27 +0000 (-0500)
Subject: qemu: validate bochs-display capability
X-Git-Tag: v5.9.0-rc1~326
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2fd6848496ab137a412a9cc66ef313f7f771cee;p=thirdparty%2Flibvirt.git

qemu: validate bochs-display capability

When the bochs display type was added, the capability was never checked.
Add that check in the same place as the other video device capability
checks.

Reviewed-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index ba1ccf992a..9de86b3ce1 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5271,7 +5271,9 @@ qemuProcessStartValidateVideo(virDomainObjPtr vm,
                  !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_GPU)) ||
                 (video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO &&
                  video->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW &&
-                 !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW))) {
+                 !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW)) ||
+                (video->type == VIR_DOMAIN_VIDEO_TYPE_BOCHS &&
+                !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_BOCHS_DISPLAY))) {
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                _("this QEMU does not support '%s' video device"),
                                virDomainVideoTypeToString(video->type));