[libvirt] [PATCH] qemu: capabilities: Fill in bochs-display info

086c19d69 added bochs-display capability but didn't fill in the info for domain capabilities. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml | 1 + 5 files changed, 6 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3b50576a2b..d0b789bbea 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5357,6 +5357,8 @@ virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps, VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_QXL); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_GPU)) VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_VIRTIO); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_BOCHS_DISPLAY)) + VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_BOCHS); return 0; } diff --git a/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml index 402848442f..059403cebc 100644 --- a/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml @@ -127,6 +127,7 @@ <value>vmvga</value> <value>qxl</value> <value>virtio</value> + <value>bochs</value> </enum> </video> <hostdev supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml index 1ffd5e3cc0..eb24b9a604 100644 --- a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml @@ -127,6 +127,7 @@ <value>vmvga</value> <value>qxl</value> <value>virtio</value> + <value>bochs</value> </enum> </video> <hostdev supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml index 79b41ef6da..f5685d2068 100644 --- a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml @@ -131,6 +131,7 @@ <value>vmvga</value> <value>qxl</value> <value>virtio</value> + <value>bochs</value> </enum> </video> <hostdev supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml index 6bdeb20479..5bd376bb2e 100644 --- a/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml @@ -131,6 +131,7 @@ <value>vmvga</value> <value>qxl</value> <value>virtio</value> + <value>bochs</value> </enum> </video> <hostdev supported='yes'> -- 2.23.0

On 10/3/19 10:28 AM, Fabiano Fidêncio wrote:
086c19d69 added bochs-display capability but didn't fill in the info for domain capabilities.
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> ---
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
src/qemu/qemu_capabilities.c | 2 ++ tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml | 1 + 5 files changed, 6 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3b50576a2b..d0b789bbea 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5357,6 +5357,8 @@ virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps, VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_QXL); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_GPU)) VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_VIRTIO); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_BOCHS_DISPLAY)) + VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_BOCHS);
return 0; } diff --git a/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml index 402848442f..059403cebc 100644 --- a/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml @@ -127,6 +127,7 @@ <value>vmvga</value> <value>qxl</value> <value>virtio</value> + <value>bochs</value> </enum> </video> <hostdev supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml index 1ffd5e3cc0..eb24b9a604 100644 --- a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml @@ -127,6 +127,7 @@ <value>vmvga</value> <value>qxl</value> <value>virtio</value> + <value>bochs</value> </enum> </video> <hostdev supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml index 79b41ef6da..f5685d2068 100644 --- a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml @@ -131,6 +131,7 @@ <value>vmvga</value> <value>qxl</value> <value>virtio</value> + <value>bochs</value> </enum> </video> <hostdev supported='yes'> diff --git a/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml index 6bdeb20479..5bd376bb2e 100644 --- a/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml @@ -131,6 +131,7 @@ <value>vmvga</value> <value>qxl</value> <value>virtio</value> + <value>bochs</value> </enum> </video> <hostdev supported='yes'>

On Thu, Oct 03, 2019 at 03:28:40PM +0200, Fabiano Fidêncio wrote:
086c19d69 added bochs-display capability but didn't fill in the info for domain capabilities.
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- If the bochs-was added in this release, then I'd say we should put it right in, but since we're already one release late, I think it can way 1 more :). Nevertheless:
Reviewed-by: Erik Skultety <eskultet@redhat.com>

On 10/3/19 3:28 PM, Fabiano Fidêncio wrote:
086c19d69 added bochs-display capability but didn't fill in the info for domain capabilities.
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml | 1 + 5 files changed, 6 insertions(+)
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> And pushed. Michal
participants (4)
-
Daniel Henrique Barboza
-
Erik Skultety
-
Fabiano Fidêncio
-
Michal Privoznik