From nobody Sat Sep 21 05:36:14 2024 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=1624364650; cv=none; d=zohomail.com; s=zohoarc; b=ARr1Tse5Mq6m/mrA6cOCPjP+WV3uPG7wRQVV8SPjnWVc/tIUVPsclYw97M94vRWjsy4k1GIUpFgdVsaxyWp/UUWYf7kGklUChLMktK9QaFGajg5hTC+k8E5k0mj29y0T3nUm0fbbyYdTehb2Hhj3kIA0LeKaJWSD/WUl/RkbWZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624364650; 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=suIdPU1SPYuDZl+yiHC7z+ZWWg+Fu06Sv7G7rfnEfZE=; b=WbVtv2aJCMRjprnRH1RW7yxmKMvgZX9GDQHzYLU6MlvIen4dYqYK55IMvskTPNWSkbTAVFw7e0kCEhhVZDdhODLG57nsWmY8G0a7Q97ewKK4KqP5lAgrU83JWa9jS3wRInRqVpfHZJ2AcRJJ/me/eL5sGzaKGMEC4ClyCkdKlyM= 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) 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 162436465006047.644808586610225; Tue, 22 Jun 2021 05:24:10 -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-548-TisDr_EgOIuVz2t2erUQSg-1; Tue, 22 Jun 2021 08:24:07 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4536A1084F58; Tue, 22 Jun 2021 12:24:01 +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 1FAE35C1D1; Tue, 22 Jun 2021 12:24:01 +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 DBF614EA39; Tue, 22 Jun 2021 12:24:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15MCNMTr005240 for ; Tue, 22 Jun 2021 08:23:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id B6BC019C79; Tue, 22 Jun 2021 12:23:22 +0000 (UTC) Received: from work.redhat.com (ovpn-113-16.ams2.redhat.com [10.36.113.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F37219C66; Tue, 22 Jun 2021 12:23:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624364649; 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=suIdPU1SPYuDZl+yiHC7z+ZWWg+Fu06Sv7G7rfnEfZE=; b=O+Gc8Fw5+szH82DvOnMrFEDf8VF8jW2StgV1ZmVkG0TZArWABTfcyCOiti8rX+aQlc6XNq u7DQm/Z/wo4zTgpTcZaXX7NcuWNdfLu2F2TCYkTBAOS4MdoeF2zgxyXGWt/SZTylDO45// zfmbeDfwFe+Vr9ltVRClheMRTb2UxJI= X-MC-Unique: TisDr_EgOIuVz2t2erUQSg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 12/16] virDomainFeaturesDefParse: Inline SMM parsing Date: Tue, 22 Jun 2021 14:22:53 +0200 Message-Id: <20210622122257.12528-13-twiederh@redhat.com> In-Reply-To: <20210622122257.12528-1-twiederh@redhat.com> References: <20210622122257.12528-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.16 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 | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 02c06d5ab9..b411c1fb8c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17554,8 +17554,7 @@ virDomainFeaturesDefParse(virDomainDef *def, case VIR_DOMAIN_FEATURE_HAP: case VIR_DOMAIN_FEATURE_PMU: case VIR_DOMAIN_FEATURE_PVSPINLOCK: - case VIR_DOMAIN_FEATURE_VMPORT: - case VIR_DOMAIN_FEATURE_SMM: { + case VIR_DOMAIN_FEATURE_VMPORT: { virTristateSwitch state; =20 if (virXMLPropTristateSwitch(nodes[i], "state", @@ -17569,6 +17568,31 @@ virDomainFeaturesDefParse(virDomainDef *def, break; } =20 + case VIR_DOMAIN_FEATURE_SMM: { + virTristateSwitch state; + + if (virXMLPropTristateSwitch(nodes[i], "state", + VIR_XML_PROP_NONE, &state) < 0) + return -1; + + if ((state =3D=3D VIR_TRISTATE_SWITCH_ABSENT) || + (state =3D=3D VIR_TRISTATE_SWITCH_ON)) { + int rv =3D virParseScaledValue("string(./features/smm/tseg= )", + "string(./features/smm/tseg/@= unit)", + ctxt, + &def->tseg_size, + 1024 * 1024, /* Defaults to m= ebibytes */ + ULLONG_MAX, + false); + if (rv < 0) + return -1; + + def->features[val] =3D VIR_TRISTATE_SWITCH_ON; + def->tseg_specified =3D rv !=3D 0; + } + break; + } + case VIR_DOMAIN_FEATURE_GIC: if (virXMLPropEnum(nodes[i], "version", virGICVersionTypeFromS= tring, VIR_XML_PROP_NONZERO, &def->gic_version) < = 0) @@ -17670,19 +17694,6 @@ virDomainFeaturesDefParse(virDomainDef *def, } VIR_FREE(nodes); =20 - if (def->features[VIR_DOMAIN_FEATURE_SMM] =3D=3D VIR_TRISTATE_SWITCH_O= N) { - int rv =3D virParseScaledValue("string(./features/smm/tseg)", - "string(./features/smm/tseg/@unit)", - ctxt, - &def->tseg_size, - 1024 * 1024, /* Defaults to mebibytes= */ - ULLONG_MAX, - false); - if (rv < 0) - return -1; - def->tseg_specified =3D rv; - } - if (def->features[VIR_DOMAIN_FEATURE_MSRS] =3D=3D VIR_TRISTATE_SWITCH_= ON) { virDomainMsrsUnknown unknown; xmlNodePtr node =3D NULL; --=20 2.31.1