From nobody Mon Feb 9 16:01:07 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=1616054517; cv=none; d=zohomail.com; s=zohoarc; b=H32yxrFgNLuFu6eKg/53ekDdYTGA1RVKOZzp4GZ1TH4LPpOhEiQ9PeLLqxCg5mgEfenXAkv5XZmEL/QBkAxJM2UkOPdXx276+j3p2DrSO7KdWGMQyHSwuH5XxqTh1chmwr3aJj7EniHg2H88Ws7Fauq8lPBmJPhKfYX74v8sEtw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616054517; 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=DHC8hxma1wzi2ob+ncuXN1xrkMspfYC8TdcU5gXYWMs=; b=jGLCIKHkmKaYc8AkJ192ZlM+dP4EgBIdAum77vB0PVJvXj9s99sHxDyO0HlEEgKGt8wtar/hv/GLwVPRSpij8rjXnzicDNEJZiODbL+IDME1kT0br4NXR8bS4lZ3h7YQ5PHeS0oTD9HjHXRoTZA+zYHgw8Mv9jkSV7fovZcQ6k8= 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 161605451782769.98185193933068; Thu, 18 Mar 2021 01:01:57 -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-112-YoVDVdz2Mh2VuWM54ayFNg-1; Thu, 18 Mar 2021 04:01:53 -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 121D6814339; Thu, 18 Mar 2021 08:01:48 +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 A70467086A; Thu, 18 Mar 2021 08:01:47 +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 637354A708; Thu, 18 Mar 2021 08:01:47 +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 12I81R9S028149 for ; Thu, 18 Mar 2021 04:01:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 705CD66FFF; Thu, 18 Mar 2021 08:01:27 +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 BB165669F2; Thu, 18 Mar 2021 08:01:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616054515; 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=DHC8hxma1wzi2ob+ncuXN1xrkMspfYC8TdcU5gXYWMs=; b=EMbylzV9ffuAZtm/DLqtio4AJHlRP93ipFC84xLGgZVREowMgkRYdWeuxDRmRJbCUFirCe VV8lGYxau8DBfvo0SGA5Phi3Kzxey5cD++VvtG68dL/PZzCVFCXxH0p2qPKoVHs2vpDHvX Cb2Y6//xT7Gu2LTlvfstiPXNJ6LsiFU= X-MC-Unique: YoVDVdz2Mh2VuWM54ayFNg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 04/38] domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainKeyWrapCipherDefParseXML Date: Thu, 18 Mar 2021 09:00:43 +0100 Message-Id: <20210318080117.70255-5-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.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 | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 47756ff0be..b6e505b384 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1441,10 +1441,9 @@ static int virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap, xmlNodePtr node) { - int state_type; + virTristateSwitch state_type =3D VIR_TRISTATE_SWITCH_ABSENT; int name_type; g_autofree char *name =3D NULL; - g_autofree char *state =3D NULL; =20 if (!(name =3D virXMLPropString(node, "name"))) { virReportError(VIR_ERR_CONF_SYNTAX, "%s", @@ -1458,15 +1457,11 @@ virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapD= efPtr keywrap, return -1; } =20 - if (!(state =3D virXMLPropString(node, "state"))) { - virReportError(VIR_ERR_CONF_SYNTAX, - _("missing state for cipher named %s"), name); + if (virXMLPropOnOff(node, "state", &state_type) < 0) return -1; - } - - if ((state_type =3D virTristateSwitchTypeFromString(state)) < 0) { + if (state_type =3D=3D VIR_TRISTATE_SWITCH_ABSENT) { virReportError(VIR_ERR_CONF_SYNTAX, - _("%s is not a supported cipher state"), state); + _("missing state for cipher named %s"), name); return -1; } =20 --=20 2.26.2