From nobody Mon Feb 9 20:09:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619188873; cv=none; d=zohomail.com; s=zohoarc; b=ikSL8h5UsMV3kF7hGxmRnMhBalikNo68zZ4cl2vIgKWtnMdT+h0aK8YOAfmmWIFcqdQ6yabbz1IdZ9zGi2d2wZJFrVADzc++2auZIj8c4gYFGss+hfZllMM23+nuzgvdvniryupjBcKJUnB0URRfMTvqDO37Abnj5ehKALB2aS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619188873; h=Content-Type:Content-Transfer-Encoding:Cc: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=V8WTMiHgzWqlvr76BTsjBBQHR+sWgxHYJTptiJ6kvuQ=; b=MKhIWYCm0bbrkMtXXOxeDRFhvZQekMBU58Kw7pjWL8Rd9mbCsSFcmR94J3+SaAv5FNq0pQzc/oGYKxUWe+6taoxfMujAlksRcJ2XEMAKxZi1JpPy7jiq/dXjThUoiY8l1LbT1BVXK7J8yqwY7DG20m5LBkZ2AcY63TAjAACdljk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1619188873254204.55069602874244; Fri, 23 Apr 2021 07:41:13 -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-140-qNpWjk61MeaPPxzQ2OV54w-1; Fri, 23 Apr 2021 10:39:49 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 52CBE1008060; Fri, 23 Apr 2021 14:39:44 +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 33CD82B0A5; Fri, 23 Apr 2021 14:39:44 +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 EF9481806D29; Fri, 23 Apr 2021 14:39:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13NEdd6L029293 for ; Fri, 23 Apr 2021 10:39:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id B4CA159465; Fri, 23 Apr 2021 14:39:39 +0000 (UTC) Received: from work.redhat.com (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id C832F60BD8; Fri, 23 Apr 2021 14:39:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619188872; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=V8WTMiHgzWqlvr76BTsjBBQHR+sWgxHYJTptiJ6kvuQ=; b=A8KKK2xYdzD5xyRU2nzf02ABoZR1Cai1JI+XRQz9WAZNVSaO/t6tSJAq+FPFMRDIr23/wg +KefF/F84gXX5t1hs80GqYvyetnqulHGPHuNSieB0RPozQS/iZdK/KOE/2lOmfP/EhE8MG ekdAl/0dGAdi12wKANbPmAkuXpPqi+w= X-MC-Unique: qNpWjk61MeaPPxzQ2OV54w-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 09/11] virDomainGraphicsListenDefParseXML: Use virXMLProp* Date: Fri, 23 Apr 2021 16:39:20 +0200 Message-Id: <20210423143922.298608-10-twiederh@redhat.com> In-Reply-To: <20210423143922.298608-1-twiederh@redhat.com> References: <20210423143922.298608-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?J=C3=A1n=20Tomko?= , Tim Wiederhake 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.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Tim Wiederhake Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 99e05613f7..98335781a6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12439,12 +12439,9 @@ virDomainGraphicsListenDefParseXML(virDomainGraphi= csListenDef *def, { int ret =3D -1; const char *graphicsType =3D virDomainGraphicsTypeToString(graphics->t= ype); - int tmp, typeVal; - g_autofree char *type =3D virXMLPropString(node, "type"); g_autofree char *address =3D virXMLPropString(node, "address"); g_autofree char *network =3D virXMLPropString(node, "network"); g_autofree char *socketPath =3D virXMLPropString(node, "socket"); - g_autofree char *fromConfig =3D virXMLPropString(node, "fromConfig"); g_autofree char *autoGenerated =3D virXMLPropString(node, "autoGenerat= ed"); g_autofree char *addressCompat =3D NULL; g_autofree char *socketCompat =3D NULL; @@ -12454,18 +12451,9 @@ virDomainGraphicsListenDefParseXML(virDomainGraphi= csListenDef *def, socketCompat =3D virXMLPropString(parent, "socket"); } =20 - if (!type) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("graphics listen type must be specified")); - goto error; - } - - if ((typeVal =3D virDomainGraphicsListenTypeFromString(type)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown graphics listen type '%s'"), type); + if (virXMLPropEnum(node, "type", virDomainGraphicsListenTypeFromString, + VIR_XML_PROP_REQUIRED, &def->type) < 0) goto error; - } - def->type =3D typeVal; =20 switch (def->type) { case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: @@ -12545,14 +12533,10 @@ virDomainGraphicsListenDefParseXML(virDomainGraph= icsListenDef *def, def->socket =3D g_steal_pointer(&socketPath); } =20 - if (fromConfig && - flags & VIR_DOMAIN_DEF_PARSE_STATUS) { - if (virStrToLong_i(fromConfig, NULL, 10, &tmp) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid fromConfig value: %s"), - fromConfig); - goto error; - } + if (flags & VIR_DOMAIN_DEF_PARSE_STATUS) { + int tmp; + if (virXMLPropInt(node, "fromConfig", 10, VIR_XML_PROP_NONE, &tmp)= < 0) + return -1; def->fromConfig =3D tmp !=3D 0; } =20 --=20 2.26.3