From nobody Mon Feb 9 16:51:23 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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=1619174319; cv=none; d=zohomail.com; s=zohoarc; b=nC40WqFPVjrVyBnOWbAJCQnPzhGSMPimMPJLn5r317bxsUtKuUYWka7HSAMdxjuv/JJGbxfn0rUJIOCo4gQQJ4QKD9xgpQTGkfJk2/UrAlY1Zl+bzuun1HXMlY4Ogey2SyieeyL/qIyMB93QRT9iDwjBurr0Q9mrg7vxQE/OI+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619174319; 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=OnnByTn4fHumWLifHZBhwE3u8VjT2ag7lKUInt6KNSk=; b=P7ufIwPt9/pFPHkpJtBl1e9JoCVU8PQ0/VLNRue2QZBKCRxZv2RVjOGIQLhM5y+5PdJ1P+ZzlPk/+9mQlDb/qNJEzLbyfLlrM0+UeaJDq6nXel32NRCJj38yc7HQjQ7Ut/0BZP7LhonuZZG2hZDAIRkLTGXKlJG/gjyVHl7J8Cw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1619174319286788.6462266575011; Fri, 23 Apr 2021 03:38:39 -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-187-zazhvD5KMu2owRrrNawSNA-1; Fri, 23 Apr 2021 06:38:36 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8CFA6107ACED; Fri, 23 Apr 2021 10:38:30 +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 6D34E690EF; Fri, 23 Apr 2021 10:38:30 +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 2C79044A68; Fri, 23 Apr 2021 10:38:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13NAc2ZI004094 for ; Fri, 23 Apr 2021 06:38:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6D2FC5C5B5; Fri, 23 Apr 2021 10:38:02 +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 A7AD65C5AE; Fri, 23 Apr 2021 10:38:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619174318; 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=OnnByTn4fHumWLifHZBhwE3u8VjT2ag7lKUInt6KNSk=; b=fxGwzS6csTv5iUNcbZrj0tcOrtjQHq3iGZvYdCoZKzNzHoEM/nNDIHovpgdanYihs+ueVa PjL9fc3SAAZZsRkNCNcPHg1OrJy+Co6ZLrke3m0XfxRrjCNVboFybLaAegMJDgBPafJWDq kuoMzBVxE/oTW7C2KwVl6qv1LpnfkCI= X-MC-Unique: zazhvD5KMu2owRrrNawSNA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 08/10] virDomainGraphicsListenDefParseXML: Use virXMLProp* Date: Fri, 23 Apr 2021 12:37:39 +0200 Message-Id: <20210423103741.65814-9-twiederh@redhat.com> In-Reply-To: <20210423103741.65814-1-twiederh@redhat.com> References: <20210423103741.65814-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: 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.11 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 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 2103aae2a3..1acd692720 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