From nobody Tue Feb 10 10:54:29 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=1616169544; cv=none; d=zohomail.com; s=zohoarc; b=TYYiXM4oxTadeRCcODyE/+MyXu9NgSW1F6V9T5Un7VpJ1yRPpfJnVLXCfKPG9kISDwvplyAbxTwaKv8I5q54X+OuRvNsHTb+GzzWkwNyONJkA6EyO5Yu5z+oJiYiKid5s9D4Ur8gyeR1hn8qbRCxrSSVeFfpZggX5GU5THKaTLM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169544; 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=m+xHuqTq0Hj3b5XxGnQt4dWTM2rs6q2d4+7JsPyIRSY=; b=EKnojmwiUhQJxmvaTZIxmErGWeSAgnFYNEaZvDMCr/JeG3ZQRLb2CKVT2+usy5wN4sXCWyJzWVC+h+0JWGS6dRFXo7+xzO3mxAB0kTFNEsyfgRKq2i9Qc+kyUE+ef65E8VJYIc7kqoHG/1Ose/5OSVWHG1F4fBf22z+8dDp9uYY= 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 1616169544159455.01275521844; Fri, 19 Mar 2021 08:59:04 -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-215-Ew8RXOLxOci78VILlm1u5w-1; Fri, 19 Mar 2021 11:58:11 -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 A2D43185FFCE; Fri, 19 Mar 2021 15:58:04 +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 7C89B60871; Fri, 19 Mar 2021 15:58:04 +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 26E0D1800662; Fri, 19 Mar 2021 15:58:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFw1ld006274 for ; Fri, 19 Mar 2021 11:58:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 166A216E3A; Fri, 19 Mar 2021 15:58:01 +0000 (UTC) Received: from work.redhat.com (ovpn-112-175.ams2.redhat.com [10.36.112.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C6EC18E4B; Fri, 19 Mar 2021 15:58:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169542; 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=m+xHuqTq0Hj3b5XxGnQt4dWTM2rs6q2d4+7JsPyIRSY=; b=gAVnrvJDGgK33Xy0aQzvas8clU7yptHTVwaSZh6dZu5pbk0B5w8AJ9fmlTTKg3yyY5R5AZ OW1Lj7wKFVHL1sJ+aps774H2e0n5gjcr0FYmpv0WWkd97EznUKUEZ/Gkfdt0sF4kH184Gw kzYfzEdB+jTdTZAH55DAHWaENlUx1ck= X-MC-Unique: Ew8RXOLxOci78VILlm1u5w-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 07/51] conf: Use virTristateXXX in virDomainChrSourceDef Date: Fri, 19 Mar 2021 16:57:04 +0100 Message-Id: <20210319155748.680146-8-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.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-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 | 34 +++++++++++++++++++++------------- src/conf/domain_conf.h | 6 +++--- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9f59756119..e99699028a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11891,12 +11891,14 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceD= efPtr def, def->data.tcp.service =3D virXMLPropString(source, "service"); =20 if ((tmp =3D virXMLPropString(source, "tls"))) { - if ((def->data.tcp.haveTLS =3D virTristateBoolTypeFromString(tmp))= <=3D 0) { + 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); } =20 @@ -11975,12 +11977,15 @@ virDomainChrSourceDefParseFile(virDomainChrSource= DefPtr def, =20 def->data.file.path =3D virXMLPropString(source, "path"); =20 - if ((append =3D virXMLPropString(source, "append")) && - (def->data.file.append =3D virTristateSwitchTypeFromString(append)= ) <=3D 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid append attribute value '%s'"), - append); - return -1; + if ((append =3D virXMLPropString(source, "append"))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(append)) <=3D 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid append attribute value '%s'"), + append); + return -1; + } + def->data.file.append =3D value; } =20 return 0; @@ -12016,12 +12021,15 @@ virDomainChrSourceDefParseLog(virDomainChrSourceD= efPtr def, =20 def->logfile =3D virXMLPropString(log, "file"); =20 - if ((append =3D virXMLPropString(log, "append")) && - (def->logappend =3D virTristateSwitchTypeFromString(append)) <=3D = 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid append attribute value '%s'"), - append); - return -1; + if ((append =3D virXMLPropString(log, "append"))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(append)) <=3D 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid append attribute value '%s'"), + append); + return -1; + } + def->logappend =3D value; } =20 return 0; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 15dc416384..6619b9f006 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1232,7 +1232,7 @@ struct _virDomainChrSourceDef { /* no for null, vc, stdio */ struct { char *path; - int append; /* enum virTristateSwitch */ + virTristateSwitch append; } file; /* pty, file, pipe, or device */ struct { char *master; @@ -1244,7 +1244,7 @@ struct _virDomainChrSourceDef { bool listen; int protocol; bool tlscreds; - int haveTLS; /* enum virTristateBool */ + virTristateBool haveTLS; bool tlsFromConfig; virDomainChrSourceReconnectDef reconnect; } tcp; @@ -1265,7 +1265,7 @@ struct _virDomainChrSourceDef { } spiceport; } data; char *logfile; - int logappend; + virTristateSwitch logappend; =20 size_t nseclabels; virSecurityDeviceLabelDefPtr *seclabels; --=20 2.26.2