From nobody Sat Feb 7 08:53:49 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=1625482076; cv=none; d=zohomail.com; s=zohoarc; b=KMWoKqFETHIwOFraeU8lSxzw8vBojGNnc7QPL3TyTFwmL728H24SjzEQ4lIfKjEPJuN0GBWoDW1H1+VKpkFwmYOLd4PaU0dnR9UnKXUXTwVPvCnTNhoOPhE9V640hf3+G4QGmh38mmxKTlpL0c38aTMac2Axn5j1KMRnjGwwEk0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625482076; 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=Pa59eZr84Zjb0WaJz4YZUPXWFDgopBM0jpofZ23IHzA=; b=n5Ynzvz6bU14GE8KuygZOsjRL+N1Gx26Smxaz0apNI0+atYSTrxr9ZyYFfOAm/r5ymVppUo/NBvudHWXIgi2nPcBCsfMn/C2DMIDUcnYwqlYz22UBPCCiEi6UQwNcC+xNxm+3rnj2opsRNFFMB5Z/+nNTdYsmOLK9XKBH5yy/fc= 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) 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 16254820763831011.4900450644868; Mon, 5 Jul 2021 03:47:56 -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-545-ihLfmawrPDmo61O_BDzqww-1; Mon, 05 Jul 2021 06:47:53 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C2AD3630C; Mon, 5 Jul 2021 10:47: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 3EB6317C58; Mon, 5 Jul 2021 10:47:48 +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 0AC664EA3C; Mon, 5 Jul 2021 10:47:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 165Al3uO008543 for ; Mon, 5 Jul 2021 06:47:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4530C60875; Mon, 5 Jul 2021 10:47:03 +0000 (UTC) Received: from work.speedport.ip (ovpn-113-101.ams2.redhat.com [10.36.113.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9465760864; Mon, 5 Jul 2021 10:47:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625482075; 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=Pa59eZr84Zjb0WaJz4YZUPXWFDgopBM0jpofZ23IHzA=; b=EcuXtHlVLlENIn4vkdde2rZJ7ly1aURC8UdKRSCb18998ZKTdVRayb230Pp9tAhv8YZpee Y90RRvPrsgchOBG3qtLr65cG4piLpz3bmVDuEvou0EFyXVBKt7MTj0f3qVA1Sxth+FVStq v1YELjw/xSXXLH4NCFHNrv8mEiApwM8= X-MC-Unique: ihLfmawrPDmo61O_BDzqww-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 3/6] virDomainSEVDefParseXML: Use virXMLPropEnum Date: Mon, 5 Jul 2021 12:46:51 +0200 Message-Id: <20210705104654.77483-4-twiederh@redhat.com> In-Reply-To: <20210705104654.77483-1-twiederh@redhat.com> References: <20210705104654.77483-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.11 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) X-ZM-MESSAGEID: 1625482078150100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 68ab18f3ab..dda615a8ba 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14721,33 +14721,16 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode, VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainSEVDef *def; unsigned long policy; - g_autofree char *type =3D NULL; - int sectype; int rc =3D -1; =20 def =3D g_new0(virDomainSEVDef, 1); =20 ctxt->node =3D sevNode; =20 - if (!(type =3D virXMLPropString(sevNode, "type"))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing launch security type")); - goto error; - } - - sectype =3D virDomainLaunchSecurityTypeFromString(type); - switch ((virDomainLaunchSecurity) sectype) { - case VIR_DOMAIN_LAUNCH_SECURITY_SEV: - break; - case VIR_DOMAIN_LAUNCH_SECURITY_NONE: - case VIR_DOMAIN_LAUNCH_SECURITY_LAST: - default: - virReportError(VIR_ERR_XML_ERROR, - _("unsupported launch security type '%s'"), - type); + if (virXMLPropEnum(sevNode, "type", virDomainLaunchSecurityTypeFromStr= ing, + VIR_XML_PROP_NONZERO | VIR_XML_PROP_REQUIRED, + &def->sectype) < 0) goto error; - } - def->sectype =3D sectype; =20 if (virXPathULongHex("string(./policy)", ctxt, &policy) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", --=20 2.31.1