From nobody Mon Feb 9 19:04:51 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=1616161468; cv=none; d=zohomail.com; s=zohoarc; b=A0ySeUy8t7brk32wWEzRt/awmsmuaYACFebLY+MEnRADSDD4a9cij1O3gLPBxJFDWJ2sVm4y27/mjvzmCXuAbMHxbfButt9Mdj7uqlBU5XicRuf1hGiwKgcmTRIb3y+VobxtUP6Y1rqRCvIJTf/YuVlNKgkciZ/icWMWv3hQlqI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161468; 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=tXp0MlmLUUamlB3PlU6DsCPrnti9ir56s0SA6t5CG2g=; b=cTF2VCqwS4zY4YXMibozOtQr4j5zB+zdoTQPC4xXRG0lTN+GYuyc5Mas4U1CvBXYep8bmTZrWdtO/8u10KTXMpLWyFTq7ATOIWvuF1i+sorEBjJWAZUSDsnnDWaF9GuF0Obd0lpRKeMOMyA55y9Tmw7CXmfbaToU028IiEFYXUU= 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 1616161468439660.0944590204157; Fri, 19 Mar 2021 06:44:28 -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-249-GsgZ5es5NWSU4TBp-qMPGw-1; Fri, 19 Mar 2021 09:42:59 -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 CCAC75A097; Fri, 19 Mar 2021 13:42:50 +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 A48596E51F; Fri, 19 Mar 2021 13:42:50 +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 3F98D50059; Fri, 19 Mar 2021 13:42:50 +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 12JDgfTB020643 for ; Fri, 19 Mar 2021 09:42:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 25CD359442; Fri, 19 Mar 2021 13:42:41 +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 6418F63B8C; Fri, 19 Mar 2021 13:42:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161467; 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=tXp0MlmLUUamlB3PlU6DsCPrnti9ir56s0SA6t5CG2g=; b=RSPLChvbC6hlJx1KVzr6qeYsAWl3nwdTlgWbGhiQGFVUv2vKmo+XSAFRwaVrmXUVp/Lvo5 aXnBdYEpEX0meGeg4tKt/0R1FLITFOx6BY+Z3lKTb/IXE2NdgkspSv0zijSjmOU46AYnHC tVEIkN90rtg78jeZzLI73nQ8voxuwmQ= X-MC-Unique: GsgZ5es5NWSU4TBp-qMPGw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 38/51] domain_conf: Use virXMLPropTristateXXX in virDomainPerfEventDefParseXML Date: Fri, 19 Mar 2021 14:40:52 +0100 Message-Id: <20210319134105.442774-39-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.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 | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8ca6cd2e44..ef1f930a96 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15443,7 +15443,7 @@ virDomainPerfEventDefParseXML(virDomainPerfDefPtr p= erf, { int event; g_autofree char *name =3D NULL; - g_autofree char *enabled =3D NULL; + virTristateBool enabled =3D VIR_TRISTATE_BOOL_ABSENT; =20 if (!(name =3D virXMLPropString(node, "name"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing perf event name= ")); @@ -15462,18 +15462,9 @@ virDomainPerfEventDefParseXML(virDomainPerfDefPtr = perf, return -1; } =20 - if (!(enabled =3D virXMLPropString(node, "enabled"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing state of perf event '%s'"), name); - return -1; - } - - if ((perf->events[event] =3D virTristateBoolTypeFromString(enabled)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid state '%s' of perf event '%s'"), - enabled, name); + if (virXMLPropTristateBool(node, "enabled", true, &enabled) < 0) return -1; - } + perf->events[event] =3D enabled; =20 return 0; } --=20 2.26.2