From nobody Tue Feb 10 00:21:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599190917; cv=none; d=zohomail.com; s=zohoarc; b=cMjnp+GniVIbEZ6xUWoun5OLojxllJeGTUoo4tgsGbwpzy8cHmFU/3UNAb9oPPPOsr/2isM2rNTQkBdIZT86cxcrjHZAll7RWKUwTOIDh00FX9dzGfuZyzmFW9jZDQ6lzpJe8pBLfyb8y12CtWJSRoXpuWYXjFDUVy8oTeKre/M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599190917; 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=pJdjrnjPjrCneuUi00YoV/tdo3UCy+le/hs6AKYsun0=; b=PX7m03oPH1xhQl0AZ9jw2NxGG38QsEb4ZXbkPpLRsvWd3JYPLzs6ABF9QB1v6EkDZLTP/k9Dic8v8vTVQ+fHD916LsS1EY+B9IIG606v+YZiGElqIbJGFH+h5MPScYzioCNyUSS1z6psd1OFOh3vOJcSPw7nT2gKVMj0JPEqWns= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1599190917264251.17071991801276; Thu, 3 Sep 2020 20:41:57 -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-351-6H3xD1liOkqjWF1bMuDbXw-1; Thu, 03 Sep 2020 23:41:54 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B766C1084C9D; Fri, 4 Sep 2020 03:41:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 942A127CC6; Fri, 4 Sep 2020 03:41:42 +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 615FC972E0; Fri, 4 Sep 2020 03:41:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0843fABM030560 for ; Thu, 3 Sep 2020 23:41:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1F1A4FED37; Fri, 4 Sep 2020 03:41:10 +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 14F44103791 for ; Fri, 4 Sep 2020 03:41:08 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 43310811E7F for ; Fri, 4 Sep 2020 03:41:08 +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-568-1NvkgXNDMLSnQwA2wNnPMw-1; Thu, 03 Sep 2020 23:41:05 -0400 Received: from localhost.localdomain (unknown [58.56.27.130]) by smtp4 (Coremail) with SMTP id JedpCgAHcNgStlFfYHYgCg--.1426S38; Fri, 04 Sep 2020 11:35:57 +0800 (CST) X-MC-Unique: 6H3xD1liOkqjWF1bMuDbXw-1 X-MC-Unique: 1NvkgXNDMLSnQwA2wNnPMw-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFCv2 36/46] conf: Extract error-checking code from virDomainGraphicsDefParseXMLSpice Date: Fri, 4 Sep 2020 11:35:28 +0800 Message-Id: <20200904033538.418579-37-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--.1426S38 X-Coremail-Antispam: 1Uf129KBjvJXoWxWr4rAryUtw1rKr18AF15CFg_yoW5WFW3pF s5ZF4rKFW5XrnxCw409a1Duw4YgFykJF47CrZ3Z3yUtrW7Grs5Aryrur4vqr4jkFWxA3y3 AF4SqFsrWF4UAaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0p_yxRPUUUUU= X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbiGx2VT1pchmm9OgAAsy 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.79 on 10.11.54.5 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.23 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 | 46 +++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bc42068..b3ec111 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14431,10 +14431,35 @@ virDomainGraphicsRDPDefParseXMLHook(xmlNodePtr no= de G_GNUC_UNUSED, } =20 =20 +static int +virDomainGraphicsSpiceDefParseXMLHook(xmlNodePtr node G_GNUC_UNUSED, + virDomainGraphicsSpiceDefPtr def, + const char *instname G_GNUC_UNUSED, + void *parent G_GNUC_UNUSED, + void *opaque) +{ + unsigned int flags =3D 0; + if (opaque) + flags =3D *((unsigned int *) opaque); + + if (def->port =3D=3D -1 && def->tlsPort =3D=3D -1) { + /* Legacy compat syntax, used -1 for auto-port */ + def->autoport =3D true; + } + + if (def->autoport && (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) { + def->port =3D 0; + def->tlsPort =3D 0; + } + + return 0; +} + + static int virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def, xmlNodePtr node, - xmlXPathContextPtr ctxt, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, unsigned int flags) { xmlNodePtr cur; @@ -14444,9 +14469,6 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphics= DefPtr def, g_autofree char *autoport =3D virXMLPropString(node, "autoport"); g_autofree char *defaultMode =3D virXMLPropString(node, "defaultMode"); =20 - if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0) - return -1; - if (port) { if (virStrToLong_i(port, NULL, 10, &def->data.spice.port) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -14482,16 +14504,6 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphic= sDefPtr def, def->data.spice.defaultMode =3D defaultModeVal; } =20 - if (def->data.spice.port =3D=3D -1 && def->data.spice.tlsPort =3D=3D -= 1) { - /* Legacy compat syntax, used -1 for auto-port */ - def->data.spice.autoport =3D true; - } - - if (def->data.spice.autoport && (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE= )) { - def->data.spice.port =3D 0; - def->data.spice.tlsPort =3D 0; - } - def->data.spice.keymap =3D virXMLPropString(node, "keymap"); =20 if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth, @@ -14701,6 +14713,10 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphic= sDefPtr def, cur =3D cur->next; } =20 + if (virDomainGraphicsSpiceDefParseXMLHook(node, &def->data.spice, NULL, + def, &flags) < 0) + return -1; + return 0; } =20 @@ -14808,6 +14824,8 @@ virDomainGraphicsDefParseXML(virDomainXMLOptionPtr = xmlopt, goto error; break; case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: + if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0) + goto error; if (virDomainGraphicsDefParseXMLSpice(def, node, ctxt, flags) < 0) goto error; break; --=20 2.25.1