From nobody Mon Feb 9 14:33:40 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=1616054595; cv=none; d=zohomail.com; s=zohoarc; b=PvAk8yiLxCcVeTGYmaf9neokoRUQLwafnmv7SVZCyxpub2WOuWB1GtIbviKFwG4aycaVcmuA/vWpM9zGn85qzW2TxVi2gX1rQAm1MDHySxauwGiyqCowxcQEgsuQ0iyf1LGgVKppoj+6zRY1CR6HcqywROfLN00qpSAHP8qVNVc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616054595; 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=pOB2c3V6Qvsltq5BIXbfVEt2sa5yUx6imlbKqY4HkMs=; b=hbj2iXUjzUp2OByQ8oK5SrpBb+AHeDkVYre2WXwVUj4IASEubab9TSk69f4aWByLhLpI3QDwzYrkBvnMQ2vER9Ktww0cw49eFmGx6L/BwPCPRhhOb2wzjEUXQfRQ7MOdI63PU/rCfeNb68llmeF7IsHA2PHKBVJIBowx/FEQCps= 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 1616054595120442.45689966246357; Thu, 18 Mar 2021 01:03:15 -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-588-1TGVdKQjMNadD2vDZpWLQw-1; Thu, 18 Mar 2021 04:02:23 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C242F190A7B6; Thu, 18 Mar 2021 08:02:18 +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 9A6C129AC3; Thu, 18 Mar 2021 08:02:18 +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 50F131802143; Thu, 18 Mar 2021 08:02:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12I826CH028719 for ; Thu, 18 Mar 2021 04:02:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 105CE69321; Thu, 18 Mar 2021 08:02:06 +0000 (UTC) Received: from work.redhat.com (ovpn-112-180.ams2.redhat.com [10.36.112.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 56BDA66FFF; Thu, 18 Mar 2021 08:02:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616054583; 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=pOB2c3V6Qvsltq5BIXbfVEt2sa5yUx6imlbKqY4HkMs=; b=M31y7CNtTPZa0u6W7YFdRFRHscjSobkMkT2gaZV7J9vik4U5TBowmfJOXQ+XBlAmpN02M1 JyWQOhwlpEkLuV2R0BPUIw/2Bz4fTrGgP3WQo8bikgt23+YyVnwVsxEZPVyaJDyT9T7VL8 NFN+dHV6h1s6OL2dhJ+jqvuVm8vbkvk= X-MC-Unique: 1TGVdKQjMNadD2vDZpWLQw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 25/38] domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainPerfEventDefParseXML Date: Thu, 18 Mar 2021 09:01:04 +0100 Message-Id: <20210318080117.70255-26-twiederh@redhat.com> In-Reply-To: <20210318080117.70255-1-twiederh@redhat.com> References: <20210318080117.70255-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.14 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 | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a1aefdf0bf..c020bf9124 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15496,7 +15496,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= ")); @@ -15515,16 +15515,12 @@ virDomainPerfEventDefParseXML(virDomainPerfDefPtr= perf, return -1; } =20 - if (!(enabled =3D virXMLPropString(node, "enabled"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing state of perf event '%s'"), name); + if (virXMLPropYesNo(node, "enabled", &enabled) < 0) return -1; - } =20 - if ((perf->events[event] =3D virTristateBoolTypeFromString(enabled)) <= 0) { + if ((perf->events[event] =3D enabled) =3D=3D VIR_TRISTATE_BOOL_ABSENT)= { virReportError(VIR_ERR_XML_ERROR, - _("invalid state '%s' of perf event '%s'"), - enabled, name); + _("missing state of perf event '%s'"), name); return -1; } =20 --=20 2.26.2