From nobody Tue Sep 9 03:20:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1748332393; cv=none; d=zohomail.com; s=zohoarc; b=Epo3kiPx08NrxXvxVNNyS4Yol1sIDx6HpTGRz0MSH7JJbQtg2JRmLIhyJsLuMyS0rkKDVhsWqmFn0BHQc+3B4nxm6l1AsuoeOAMdUIvn7Vwf82RMH8EcsValV9JiWHPMypJur5++AjBkBGwVM6mwVjDcS7GbdGHtKFPDoOryFfM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748332393; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=vfPzrsOsXJWbtObCizGfF0D4vIvF3D7tgu4iAbjnrnQ=; b=nyf8GDJFic1bUQ3Quf+mGb4RP3D0cdgQMv/GE/wOGJjabDxHA3tuUkMlxtrB4LD6sGdHiZ6dhvMU99bK/7Th5JYDG0i292aRQxMikTRGpR6P3Sg3uZi8FLuCQoC+X8RaPQbARQCznA7Ws21NozgLM3I6/NiZ01VMn+vgRyyXo1Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1748332393648908.2866975398; Tue, 27 May 2025 00:53:13 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A0E70B69; Tue, 27 May 2025 03:53:12 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 55D071643; Tue, 27 May 2025 03:49:48 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 50EC216C1; Tue, 27 May 2025 03:49:41 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 65E8214EF for ; Tue, 27 May 2025 03:49:22 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-516-Sg4KWzvBPOS8eC8nEhtA8Q-1; Tue, 27 May 2025 03:49:20 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 55F8F1800ECC for ; Tue, 27 May 2025 07:49:19 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.3]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8BB8D180047F for ; Tue, 27 May 2025 07:49:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748332162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WLp/o5TDbem562nkc+MbppwCP1mt+OyeGsuW5cuwgOQ=; b=H39Fw7uqm3U0eeUcr0wsdvfG8B6T9m0+CPcVEqXs818use9JU9N6lBGTSFX2I8TuBijqYI WbeeeUA4+cR74UFm2UjJOFk1LpMYohghV8c60FUGN9INBGq96zsPpZrxpNLYMpBIUsIybk sYK64TQS0v+ccYZzeSBVKFir2bU/tgU= X-MC-Unique: Sg4KWzvBPOS8eC8nEhtA8Q-1 X-Mimecast-MFC-AGG-ID: Sg4KWzvBPOS8eC8nEhtA8Q_1748332159 To: devel@lists.libvirt.org Subject: [PATCH 9/9] qemuProcessStartValidateGraphics: Move RDP validation logic to qemu_validate.c Date: Tue, 27 May 2025 09:49:05 +0200 Message-ID: <31e2d1606a6e04a7e2b1b896f1bc1bf6ed969e99.1748332058.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: QlHB5_TqW-rkN-jF0LkkWKy2V9P1J9HR6wu4Xnn8-po_1748332159 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZXZU7RUWQ4QUD7XIWO3NU6LPBUIXW5GD X-Message-ID-Hash: ZXZU7RUWQ4QUD7XIWO3NU6LPBUIXW5GD X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1748332395012116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Move the rest of the RDP graphics validation code to qemuValidateDomainDeviceDefRDPGraphics together with the rest of the validation. Signed-off-by: Peter Krempa --- src/qemu/qemu_process.c | 54 ---------------------------------------- src/qemu/qemu_validate.c | 20 +++++++++++++-- 2 files changed, 18 insertions(+), 56 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 920adef7df..82cab3f76e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5509,57 +5509,6 @@ qemuProcessMakeDir(virQEMUDriver *driver, } -static bool -virDomainDefHasDBus(const virDomainDef *def, bool p2p) -{ - size_t i =3D 0; - - for (i =3D 0; i < def->ngraphics; i++) { - virDomainGraphicsDef *graphics =3D def->graphics[i]; - - if (graphics->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_DBUS) { - return graphics->data.dbus.p2p =3D=3D p2p; - } - } - - return false; -} - - -static int -qemuProcessStartValidateGraphics(virDomainObj *vm) -{ - size_t i; - - for (i =3D 0; i < vm->def->ngraphics; i++) { - virDomainGraphicsDef *graphics =3D vm->def->graphics[i]; - - switch (graphics->type) { - case VIR_DOMAIN_GRAPHICS_TYPE_VNC: - case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: - break; - - case VIR_DOMAIN_GRAPHICS_TYPE_RDP: - if (!virDomainDefHasDBus(vm->def, false)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("qemu-rdp support requires a D-Bus bus gr= aphics device.")); - return -1; - } - break; - - case VIR_DOMAIN_GRAPHICS_TYPE_SDL: - case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: - case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: - case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: - case VIR_DOMAIN_GRAPHICS_TYPE_LAST: - break; - } - } - - return 0; -} - - /* 250 parts per million (ppm) is a half of NTP threshold */ #define TSC_TOLERANCE 250 @@ -5664,9 +5613,6 @@ qemuProcessStartValidate(virQEMUDriver *driver, if (virDomainDefValidate(vm->def, 0, driver->xmlopt, qemuCaps) < 0) return -1; - if (qemuProcessStartValidateGraphics(vm) < 0) - return -1; - if (vm->def->cpu) { if (virCPUValidateFeatures(vm->def->os.arch, vm->def->cpu) < 0) return -1; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 1aa54bf59f..de391ce34d 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4522,8 +4522,11 @@ qemuValidateDomainDeviceDefDBusGraphics(const virDom= ainGraphicsDef *graphics, static int -qemuValidateDomainDeviceDefRDPGraphics(const virDomainGraphicsDef *graphic= s) +qemuValidateDomainDeviceDefRDPGraphics(const virDomainGraphicsDef *graphic= s, + const virDomainDef *def) { + size_t i; + if (graphics->nListens > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("qemu-rdp does not support multiple listens for o= ne graphics device.")); @@ -4546,6 +4549,19 @@ qemuValidateDomainDeviceDefRDPGraphics(const virDoma= inGraphicsDef *graphics) return -1; } + for (i =3D 0; i < def->ngraphics; i++) { + virDomainGraphicsDef *g =3D def->graphics[i]; + + if (g->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_DBUS && g->data.dbus.p= 2p =3D=3D false) + break; + } + + if (i =3D=3D def->ngraphics) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("qemu-rdp support requires a D-Bus bus graphics d= evice.")); + return -1; + } + return 0; } @@ -4623,7 +4639,7 @@ qemuValidateDomainDeviceDefGraphics(const virDomainGr= aphicsDef *graphics, break; case VIR_DOMAIN_GRAPHICS_TYPE_RDP: - if (qemuValidateDomainDeviceDefRDPGraphics(graphics) < 0) + if (qemuValidateDomainDeviceDefRDPGraphics(graphics, def) < 0) return -1; break; --=20 2.49.0