From nobody Thu Nov 14 07:15:33 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=1624364791; cv=none; d=zohomail.com; s=zohoarc; b=eg93dJvnQKaItp2agismZ8j+ZoWm+yshHvMsOI8sDeI+ovOgZTDV6DVZcApbvN0NO6JmBRnPWUhXVKeDVjw09IuFoTS3hAx812DRewD6Ul1YuxpYksVnbrnw+sGcWWD+AfC0PK/gulC5cgH8mLQ1zftyUeYikCEEN9nYAvOYw/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624364791; 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=BCmllfsmvypy146sNRXdcS3tmWoS9T6gMf6pFKEYBf0=; b=W+XcU+NiDUYJBGIixLZ3/NMU9m8XyWF0uVzaoZBOCex5FedeMuawo/6CtGkRxi44DSKd6EEkpDRwyGkvwwvkg20ShWMUhEftzm9Lkw9NQaKjQYbND9TRctg602MBNaVpGc/rpZiT1iSDyFA9WIUpbi12hnE3vsVqloOAAP6E7/Y= 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 1624364791832331.6372525093144; Tue, 22 Jun 2021 05:26:31 -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-318-whAqUdLoPYulDc3dEk7D8g-1; Tue, 22 Jun 2021 08:26:09 -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 BF33C1084F5A; Tue, 22 Jun 2021 12:26:03 +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 A447560936; Tue, 22 Jun 2021 12:26:03 +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 6FDED181A6EB; Tue, 22 Jun 2021 12:26:03 +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 15MCNNtE005250 for ; Tue, 22 Jun 2021 08:23:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id B9DD219C66; Tue, 22 Jun 2021 12:23:23 +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 13CC819C46; Tue, 22 Jun 2021 12:23:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624364771; 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=BCmllfsmvypy146sNRXdcS3tmWoS9T6gMf6pFKEYBf0=; b=BhbAOhuipo2C0Ernqoz4JNyF/XQsJPW9EMMgTO1uwB7hhTk7Jp68TNOwpAVy0CtfaTVOSQ wVXGzt06g9AmqyMG/7jXcxrnkcb4JbT2MBz5sqyFb0EsNA90nYJK9tNczVHEF9zktclSFC JT+lG4iFQqOTxmLtVbD3fk9jdreK5XA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624364791; 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=BCmllfsmvypy146sNRXdcS3tmWoS9T6gMf6pFKEYBf0=; b=ZmrmPcSqDZy1deLc0srlRPf+HfUb8jVs31o9fnQuE3D9UMInqfkmvvG/uZrSziyLooNJFR bCQyoLj+LlNuyWv6TBu+ZhgZMqntbfYDy2LvHJ3N5/THtoEOrclizbt5FbS9Y/N3cWnDMr cpRbSa6OV0pTMYlzpzjjM7tAoHYWVX0= X-MC-Unique: whAqUdLoPYulDc3dEk7D8g-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 13/16] virDomainFeaturesDefParse: Inline MSRS parsing Date: Tue, 22 Jun 2021 14:22:54 +0200 Message-Id: <20210622122257.12528-14-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.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) (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b411c1fb8c..915303adcd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17518,10 +17518,21 @@ virDomainFeaturesDefParse(virDomainDef *def, case VIR_DOMAIN_FEATURE_PAE: case VIR_DOMAIN_FEATURE_VIRIDIAN: case VIR_DOMAIN_FEATURE_PRIVNET: - case VIR_DOMAIN_FEATURE_MSRS: def->features[val] =3D VIR_TRISTATE_SWITCH_ON; break; =20 + case VIR_DOMAIN_FEATURE_MSRS: { + virDomainMsrsUnknown unknown; + if (virXMLPropEnum(nodes[i], "unknown", + virDomainMsrsUnknownTypeFromString, + VIR_XML_PROP_REQUIRED, &unknown) < 0) + return -1; + + def->features[val] =3D VIR_TRISTATE_SWITCH_ON; + def->msrs_features[VIR_DOMAIN_MSRS_UNKNOWN] =3D unknown; + break; + } + case VIR_DOMAIN_FEATURE_HYPERV: if (virDomainFeaturesHyperVDefParse(def, nodes[i]) < 0) return -1; @@ -17694,19 +17705,6 @@ virDomainFeaturesDefParse(virDomainDef *def, } VIR_FREE(nodes); =20 - if (def->features[VIR_DOMAIN_FEATURE_MSRS] =3D=3D VIR_TRISTATE_SWITCH_= ON) { - virDomainMsrsUnknown unknown; - xmlNodePtr node =3D NULL; - if ((node =3D virXPathNode("./features/msrs", ctxt)) =3D=3D NULL) - return -1; - - if (virXMLPropEnum(node, "unknown", virDomainMsrsUnknownTypeFromSt= ring, - VIR_XML_PROP_REQUIRED, &unknown) < 0) - return -1; - - def->msrs_features[VIR_DOMAIN_MSRS_UNKNOWN] =3D unknown; - } - if ((n =3D virXPathNodeSet("./features/capabilities/*", ctxt, &nodes))= < 0) return -1; =20 --=20 2.31.1