From nobody Mon Feb 9 22:18:49 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=1616161323; cv=none; d=zohomail.com; s=zohoarc; b=CxZsDWAyLzdQX+X8KAUHKyMDHntwX7lbwODuwhAnWdKgxH7XcFqMRWlLhvexfzQvLn7b62eiOoQEQGwNeGRV7Ark++lBiE9jvo494FUzi6lHrVd+8bpUz94oeIg/sHzwWd5fOIDn/0vM8N5pxWB0edBJOAYH/VeXcGxKtMTz7EI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161323; 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=pKNv7h7cACLhwVdV6OZLq0TKdRIqIqtXfnepfEvmD5Q=; b=LJUFV7miAiNdymBdg9QKdROsng1ObBR+fLkeeK7vmd0EdyvjrYDBMmk7mnCYRPiQLp+1TjFiywPo/6aB1v89YWvUAnvXUIHF92YCtY9ky08fS1MYTa06y9PhqWUfQECkJMtHe2dL9UjIBIDa06oS0X0MbbLS6V/txkWTPkzNIrM= 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 1616161323512645.9848409620604; Fri, 19 Mar 2021 06:42:03 -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-2-BFh1E2xyOKaHUtw3-JZwow-1; Fri, 19 Mar 2021 09:42:00 -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 72D1310866A8; Fri, 19 Mar 2021 13:41:54 +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 43B3B1F048; Fri, 19 Mar 2021 13:41:54 +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 F0EBA1802147; Fri, 19 Mar 2021 13:41:53 +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 12JDfiPk019588 for ; Fri, 19 Mar 2021 09:41:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2A0234F3C6; Fri, 19 Mar 2021 13:41:44 +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 73A392BFEE; Fri, 19 Mar 2021 13:41:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161322; 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=pKNv7h7cACLhwVdV6OZLq0TKdRIqIqtXfnepfEvmD5Q=; b=hR0AIvqyyZsgE36XJafBcAVmfyjXzbj7yqKNQSmd/28qbPGtjcos4L7PTnGekEsjHNsMJ8 tSGJ55lFKKHcgBIVraY6CeWjGckM2dOZ6iii7/eV8TNMTBGRvyB5SXDzjgtLVN1LpYjl5Q PVMrDZ/30qpWRgPHd2SwUKkkJ9Je3uo= X-MC-Unique: BFh1E2xyOKaHUtw3-JZwow-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 24/51] domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceReconnectDefParseXML Date: Fri, 19 Mar 2021 14:40:38 +0100 Message-Id: <20210319134105.442774-25-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-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: 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.23 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 | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bcc89c0afc..fef0b7235a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10619,7 +10619,6 @@ virDomainChrSourceReconnectDefParseXML(virDomainChr= SourceReconnectDefPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - int tmpVal; VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr cur; g_autofree char *tmp =3D NULL; @@ -10627,16 +10626,8 @@ virDomainChrSourceReconnectDefParseXML(virDomainCh= rSourceReconnectDefPtr def, ctxt->node =3D node; =20 if ((cur =3D virXPathNode("./reconnect", ctxt))) { - if ((tmp =3D virXMLPropString(cur, "enabled"))) { - if ((tmpVal =3D virTristateBoolTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid reconnect enabled value: '%s'"), - tmp); - return -1; - } - def->enabled =3D tmpVal; - VIR_FREE(tmp); - } + if (virXMLPropTristateBool(cur, "enabled", false, &def->enabled) <= 0) + return -1; =20 if (def->enabled =3D=3D VIR_TRISTATE_BOOL_YES) { if ((tmp =3D virXMLPropString(cur, "timeout"))) { --=20 2.26.2