On a Wednesday in 2025, Kirill Shchetiniuk via Devel wrote:
From: Kirill Shchetiniuk <kshch...@redhat.com>Previously, the RDP graphics definition parsing were implemented by string parsing, the virDomainGraphicsDefParseXMLRDP function is refactored to use the appropriate virXMLProp* utility functions. Overall parsing logic was not changed and results the same output as before. Moreover, 'replaceUser' and 'mutliUser' params type was changed from bool to tristate type, to avoid unnecessary type convertions. Signed-off-by: Kirill Shchetiniuk <kshch...@redhat.com> --- src/conf/domain_conf.c | 51 +++++++++++++++++++++------------------- src/conf/domain_conf.h | 4 ++-- src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_validate.c | 4 ++-- src/vbox/vbox_common.c | 8 +++---- 5 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 54b84922d6..02cca5fb6b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5550,12 +5550,12 @@ qemuProcessStartValidateGraphics(virDomainObj *vm) _("qemu-rdp does not support multiple listens for one graphics device.")); return -1; } - if (graphics->data.rdp.multiUser) { + if (graphics->data.rdp.multiUser == VIR_TRISTATE_BOOL_YES) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("qemu-rdp doesn't support the 'multiUser' attribute.")); return -1; } - if (graphics->data.rdp.replaceUser) { + if (graphics->data.rdp.replaceUser == VIR_TRISTATE_BOOL_YES) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("qemu-rdp doesn't support the 'replaceUser' attribute.")); return -1;
This hunk no longer applies since it was removed upstream by:
commit e5eb3713437d8b374beb67d816076f4aa1f1a5d6
Author: Peter Krempa <pkre...@redhat.com>
CommitDate: 2025-06-03 13:11:02 +0200
qemuProcessStartValidateGraphics: Remove redundant checks for RDP protocol
features
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index e45f636418..968533ccf3 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -4512,12 +4512,12 @@ qemuValidateDomainDeviceDefDBusGraphics(const
virDomainGraphicsDef *graphics,
static int
qemuValidateDomainDeviceDefRDPGraphics(const virDomainGraphicsDef *graphics)
{
- if (graphics->data.rdp.replaceUser) {
+ if (graphics->data.rdp.replaceUser == VIR_TRISTATE_BOOL_YES) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("RDP doesn't support 'replaceUser'"));
return -1;
}
- if (graphics->data.rdp.multiUser) {
+ if (graphics->data.rdp.multiUser == VIR_TRISTATE_BOOL_YES) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("RDP doesn't support 'multiUser'"));
return -1;
Jano
signature.asc
Description: PGP signature
