From nobody Tue Feb 10 05:44:01 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=1619087622; cv=none; d=zohomail.com; s=zohoarc; b=kyXxLuyplRmxNRTRNFCz7FwBJ268MWpmrzpgy/NXnlfG1P/ZaY04k6/W4Wzej+GfIv/MJMlNhk/BmOqwHdhG0hjxXN8s8RbkgFqLqaQ0k09f+/et7EabFPDT1INc0vFdAWGHKdsbRGnYqr+EdHBMAhtT6XS4Oab/syZImxswpUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619087622; 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=Ujv2RZslQr498p/TAE7HZA8KJakMm/BURm/dMB+RYas=; b=RmjZa9iNfcY7B3wBr7+V/pSrIDCSuDvTg79k3DUkPBG0BLFrJJnlE+eVvKoC///aAq/4Po8qN19YqeyqRqINdCm9iedBgo00Ejal6vEBmYTXzWX33hY+I8BawolIcgPTlbuo+vpFTXt666b7jxJramSolXTJwVy+ambN/a64jXo= 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 1619087622842854.1973785868533; Thu, 22 Apr 2021 03:33:42 -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-17-2Q81POToM0aTF2cW90-MfA-1; Thu, 22 Apr 2021 06:33:39 -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 1DC4719251B0; Thu, 22 Apr 2021 10:33:32 +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 E83F1100F49F; Thu, 22 Apr 2021 10:33:31 +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 B751C180B654; Thu, 22 Apr 2021 10:33:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13MAXCBN009823 for ; Thu, 22 Apr 2021 06:33:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id AEBEC10016FE; Thu, 22 Apr 2021 10:33:12 +0000 (UTC) Received: from work.redhat.com (ovpn-114-56.ams2.redhat.com [10.36.114.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03FE510023AC; Thu, 22 Apr 2021 10:33:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619087621; 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=Ujv2RZslQr498p/TAE7HZA8KJakMm/BURm/dMB+RYas=; b=X9kI5HN6dQMUDeFNEhk3ZPFA9/K07fvV2M77+ny1IGyFmX/+8XKUwQ/1xsa3ZteoPox+Hi CCSCwBIWVUFDHtHGXzy6h87MeB7Q4U637qfgCrvXPy2qQwjbeD0D9DDk/PzcCSVznhvW4H sq1nHE7NyyHaXM2ieQ0vk/NGNh8B0mM= X-MC-Unique: 2Q81POToM0aTF2cW90-MfA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 10/10] virDomainChrSourceDefParseTCP: Use virXMLProp* Date: Thu, 22 Apr 2021 12:32:57 +0200 Message-Id: <20210422103257.119508-11-twiederh@redhat.com> In-Reply-To: <20210422103257.119508-1-twiederh@redhat.com> References: <20210422103257.119508-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.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 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 --- src/conf/domain_conf.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 447fc7dfcb..24c0943d62 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11477,8 +11477,6 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDef= *def, unsigned int flags) { virDomainChrSourceModeType mode =3D VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT; - int tmpVal; - g_autofree char *tmp =3D NULL; =20 if (virXMLPropEnum(source, "mode", virDomainChrSourceModeTypeFromStrin= g, VIR_XML_PROP_NONE, &mode) < 0) @@ -11488,26 +11486,16 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceD= ef *def, def->data.tcp.host =3D virXMLPropString(source, "host"); def->data.tcp.service =3D virXMLPropString(source, "service"); =20 - if ((tmp =3D virXMLPropString(source, "tls"))) { - int value; - if ((value =3D virTristateBoolTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown chardev 'tls' setting '%s'"), - tmp); - return -1; - } - def->data.tcp.haveTLS =3D value; - VIR_FREE(tmp); - } + if (virXMLPropTristateBool(source, "tls", VIR_XML_PROP_NONE, + &def->data.tcp.haveTLS) < 0) + return -1; =20 - if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && - (tmp =3D virXMLPropString(source, "tlsFromConfig"))) { - if (virStrToLong_i(tmp, NULL, 10, &tmpVal) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid tlsFromConfig value: %s"), - tmp); + if (flags & VIR_DOMAIN_DEF_PARSE_STATUS) { + int tmpVal; + + if (virXMLPropInt(source, "tlsFromConfig", 10, VIR_XML_PROP_NONE, + &tmpVal) < 0) return -1; - } def->data.tcp.tlsFromConfig =3D !!tmpVal; } =20 --=20 2.26.3