From nobody Tue Feb 10 00:59:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599190907; cv=none; d=zohomail.com; s=zohoarc; b=LhyKPGrsi+sol+iOsL+uHSZsFyVw7UbcHIv6a5/VUGPziKQiIMaMjnBoPyEx0urZ6q6TBBuEg3ZkTPnyJ8opv/i+85kqNPvyauZTBOBl3aOE2zrMjuiWoYsdOer/mtb+TGrzQuoTz18aaIn+CYel6x2J9MWt4M1EiY6v/XNxwHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599190907; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mDIlY3aEj1LE25cgzvJylaIscuJv3BolEdnkxe030bA=; b=G5ORpBabATscJxi+HoLXn5CRf4tvUFZabru+lWdfurobSJlc2xNA9CxRoYHgRtfIujaVB5+pS4wdbzaGV9n80k3Q0XBXlI4CeRRepUzUsGY/ut29rFxdM/zFFOp9taeRdOPkHifvSYXIgDdTJgb6FhasRxotmIsMlrldXsb08uk= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1599190907767114.27684487728288; Thu, 3 Sep 2020 20:41:47 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-218-FH3ZFFZAN-64xz3uq02hHQ-1; Thu, 03 Sep 2020 23:41:45 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B44E21084C80; Fri, 4 Sep 2020 03:41:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 91E961002D5E; Fri, 4 Sep 2020 03:41:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5F9E8180B65D; Fri, 4 Sep 2020 03:41:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0843f9gL030556 for ; Thu, 3 Sep 2020 23:41:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id B73072157F4B; Fri, 4 Sep 2020 03:41:09 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AD7772157F23 for ; Fri, 4 Sep 2020 03:41:07 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B4270811E79 for ; Fri, 4 Sep 2020 03:41:07 +0000 (UTC) Received: from mail-m24147.qiye.163.com (mail-m24147.qiye.163.com [220.194.24.147]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-359-iMrISobINcSxWngFs2wuNA-1; Thu, 03 Sep 2020 23:41:04 -0400 Received: from localhost.localdomain (unknown [58.56.27.130]) by smtp4 (Coremail) with SMTP id JedpCgAHcNgStlFfYHYgCg--.1426S30; Fri, 04 Sep 2020 11:35:55 +0800 (CST) X-MC-Unique: FH3ZFFZAN-64xz3uq02hHQ-1 X-MC-Unique: iMrISobINcSxWngFs2wuNA-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFCv2 28/46] conf: Replace virDomainGraphicsDefParseXMLVNC(hardcoded) with virDomainGraphicsVNCDefParseXML(generated) Date: Fri, 4 Sep 2020 11:35:20 +0800 Message-Id: <20200904033538.418579-29-shi_lei@massclouds.com> In-Reply-To: <20200904033538.418579-1-shi_lei@massclouds.com> References: <20200904033538.418579-1-shi_lei@massclouds.com> MIME-Version: 1.0 X-CM-TRANSID: JedpCgAHcNgStlFfYHYgCg--.1426S30 X-Coremail-Antispam: 1Uf129KBjvJXoWxWr47GF13CF17XFWkKr1xXwb_yoWrWFykpF s3XF1fCrWFqrs5G3yv9a15uwsFkFyDGw47J348uw1UXrWUWrs5Cw1fZr1Ig3yUKrWIvFWf uFWSqr4jgF48AFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0piAnY3UUUUU= X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbiSxuVT1dqAiiJlgAAsC X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false; X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Shi Lei --- src/conf/domain_conf.c | 71 ++---------------------------------------- src/conf/domain_conf.h | 16 +++++----- 2 files changed, 10 insertions(+), 77 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index aedf278..54b4da9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14356,7 +14356,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsD= efPtr def, } =20 =20 -static int +int virDomainGraphicsVNCDefParseXMLHook(xmlNodePtr node G_GNUC_UNUSED, virDomainGraphicsVNCDefPtr def, const char *instname G_GNUC_UNUSED, @@ -14401,73 +14401,6 @@ virDomainGraphicsVNCDefParseXMLHook(xmlNodePtr nod= e G_GNUC_UNUSED, } =20 =20 -static int -virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def, - xmlNodePtr node, - xmlXPathContextPtr ctxt G_GNUC_UNUSED, - unsigned int flags) -{ - g_autofree char *port =3D virXMLPropString(node, "port"); - g_autofree char *websocket =3D virXMLPropString(node, "websocket"); - g_autofree char *websocketGenerated =3D virXMLPropString(node, "websoc= ketGenerated"); - g_autofree char *sharePolicy =3D virXMLPropString(node, "sharePolicy"); - g_autofree char *autoport =3D virXMLPropString(node, "autoport"); - - if (port) { - if (virStrToLong_i(port, NULL, 10, &def->data.vnc.port) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse vnc port %s"), port); - return -1; - } - } - - if (autoport) - ignore_value(virStringParseYesNo(autoport, &def->data.vnc.autoport= )); - - if (websocket) { - if (virStrToLong_i(websocket, - NULL, 10, - &def->data.vnc.websocket) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse vnc WebSocket port %s"), websoc= ket); - return -1; - } - } - - if (websocketGenerated) - ignore_value(virStringParseYesNo(websocketGenerated, - &def->data.vnc.websocketGenerated)); - - if (sharePolicy) { - int policy =3D - virDomainGraphicsVNCSharePolicyTypeFromString(sharePolicy); - - if (policy < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown vnc display sharing policy '%s'"), - sharePolicy); - return -1; - } else { - def->data.vnc.sharePolicy =3D policy; - } - } - - def->data.vnc.keymap =3D virXMLPropString(node, "keymap"); - - if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth, - NULL, def, NULL) < 0) - return -1; - - if (virDomainGraphicsVNCDefParseXMLHook(node, &def->data.vnc, NULL, de= f, &flags, - port, websocket, - websocketGenerated, autoport, - sharePolicy) < 0) - return -1; - - return 0; -} - - static int virDomainGraphicsDefParseXMLRDP(virDomainGraphicsDefPtr def, xmlNodePtr node, @@ -14892,7 +14825,7 @@ virDomainGraphicsDefParseXML(virDomainXMLOptionPtr = xmlopt, =20 switch (def->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: - if (virDomainGraphicsDefParseXMLVNC(def, node, ctxt, flags) < 0) + if (virDomainGraphicsVNCDefParseXML(node, &def->data.vnc, NULL, de= f, &flags) < 0) goto error; if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0) goto error; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9724b02..e262246 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1682,15 +1682,15 @@ struct _virDomainGraphicsSDLDef { /* genparse, ge= nformat:separate */ virTristateBool gl; /* xmlattr:gl/enable */ }; =20 -struct _virDomainGraphicsVNCDef { - int port; +struct _virDomainGraphicsVNCDef { /* genparse:withhook */ + int port; /* xmlattr */ bool portReserved; - int websocket; - bool websocketGenerated; - bool autoport; - char *keymap; - virDomainGraphicsAuthDef auth; - int sharePolicy; + int websocket; /* xmlattr */ + bool websocketGenerated; /* xmlattr */ + bool autoport; /* xmlattr */ + char *keymap; /* xmlattr */ + virDomainGraphicsAuthDef auth; /* xmlgroup */ + virDomainGraphicsVNCSharePolicy sharePolicy; /* xmlattr */ }; =20 struct _virDomainGraphicsRDPDef { --=20 2.25.1