From nobody Thu Nov 14 07:16:12 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=1624364622; cv=none; d=zohomail.com; s=zohoarc; b=fGaTtLTSFPBQCmL1PlUwNM9lFiOKGr6ngkBBGdcOPmmo7N1KkIZQhHJMTMiTbVxD8rlu+/sygs5mwPcIIyzZINPHxxmY9ARNl0poI96WPmabKw03q7YHJXvihU4qFJ5d1AntOCrJDdJuHl9BHJObfs/S4Xz1FRTSyNOIBTijVQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624364622; 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=sDj36OI02Xa7ZGg/TMhDhbDU8vy9NgLpkhXDW8CRPVQ=; b=jB3wH8zgNomYEwC/GU5aBRl5OFl9rflyFvv20XAUH46cMEQngINQpDLHxnyGxJfEQZ7TsHfU4a3kCia+M5lEM5XT55ibnR4B075cH4TxQox4+2Yv1J76eUEwz1m+CByv2gUiBTWFhEd0xf6bz8GNx8HZ6PHl2eAKV/qzZ+VXqvw= 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 1624364622557468.2851593926748; Tue, 22 Jun 2021 05:23:42 -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-168-laOHO9xSPGGxJ3kcBD9G6A-1; Tue, 22 Jun 2021 08:23:39 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DCF72800D55; Tue, 22 Jun 2021 12:23:33 +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 486BF10016FE; Tue, 22 Jun 2021 12:23:31 +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 2B3861809C98; Tue, 22 Jun 2021 12:23:27 +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 15MCN8uC005140 for ; Tue, 22 Jun 2021 08:23:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1921D19C46; Tue, 22 Jun 2021 12:23:08 +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 66B5C19C79; Tue, 22 Jun 2021 12:23:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624364621; 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=sDj36OI02Xa7ZGg/TMhDhbDU8vy9NgLpkhXDW8CRPVQ=; b=RXZHS/tU64W5/3hC3ee2Zri8NGjYuwXn5+bDy2TPZlNrm7zXRuQ4eh6hGrzSjPnk2ak6MK YHXQelDeHYTQitCA81XQ7bGP5VCiBpVz4Vs1OP1IKIrwOJ4kNthPtKVNt7E8df4kD8JWwh eApSLudOlvH9TODZZho+3Bsma9hu16o= X-MC-Unique: laOHO9xSPGGxJ3kcBD9G6A-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 04/16] virDomainFeaturesHyperVDefParse: Remove tautological "if" Date: Tue, 22 Jun 2021 14:22:45 +0200 Message-Id: <20210622122257.12528-5-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.84 on 10.5.11.22 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" Fix some line wrapping in the process. Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 163 +++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 86 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b778dfe463..3ba41869ec 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17292,115 +17292,106 @@ virDomainFeaturesHyperVDefParse(virDomainDef *d= ef, { def->features[VIR_DOMAIN_FEATURE_HYPERV] =3D VIR_TRISTATE_SWITCH_ON; =20 - if (def->features[VIR_DOMAIN_FEATURE_HYPERV] =3D=3D VIR_TRISTATE_SWITC= H_ON) { + node =3D xmlFirstElementChild(node); + while (node !=3D NULL) { int feature; virTristateSwitch value; + xmlNodePtr child; =20 - node =3D xmlFirstElementChild(node); - while (node !=3D NULL) { - xmlNodePtr child; + feature =3D virDomainHypervTypeFromString((const char *)node->name= ); + if (feature < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported HyperV Enlightenment feature: %s= "), + node->name); + return -1; + } =20 - feature =3D virDomainHypervTypeFromString((const char *)node->= name); - if (feature < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported HyperV Enlightenment feature= : %s"), - node->name); - return -1; - } + if (virXMLPropTristateSwitch(node, "state", VIR_XML_PROP_REQUIRED, + &value) < 0) + return -1; =20 - if (virXMLPropTristateSwitch(node, "state", - VIR_XML_PROP_REQUIRED, &value) < = 0) - return -1; + def->hyperv_features[feature] =3D value; =20 - def->hyperv_features[feature] =3D value; + switch ((virDomainHyperv) feature) { + case VIR_DOMAIN_HYPERV_RELAXED: + case VIR_DOMAIN_HYPERV_VAPIC: + case VIR_DOMAIN_HYPERV_VPINDEX: + case VIR_DOMAIN_HYPERV_RUNTIME: + case VIR_DOMAIN_HYPERV_SYNIC: + case VIR_DOMAIN_HYPERV_RESET: + case VIR_DOMAIN_HYPERV_FREQUENCIES: + case VIR_DOMAIN_HYPERV_REENLIGHTENMENT: + case VIR_DOMAIN_HYPERV_TLBFLUSH: + case VIR_DOMAIN_HYPERV_IPI: + case VIR_DOMAIN_HYPERV_EVMCS: + break; =20 - switch ((virDomainHyperv) feature) { - case VIR_DOMAIN_HYPERV_RELAXED: - case VIR_DOMAIN_HYPERV_VAPIC: - case VIR_DOMAIN_HYPERV_VPINDEX: - case VIR_DOMAIN_HYPERV_RUNTIME: - case VIR_DOMAIN_HYPERV_SYNIC: - case VIR_DOMAIN_HYPERV_RESET: - case VIR_DOMAIN_HYPERV_FREQUENCIES: - case VIR_DOMAIN_HYPERV_REENLIGHTENMENT: - case VIR_DOMAIN_HYPERV_TLBFLUSH: - case VIR_DOMAIN_HYPERV_IPI: - case VIR_DOMAIN_HYPERV_EVMCS: + case VIR_DOMAIN_HYPERV_STIMER: + if (value !=3D VIR_TRISTATE_SWITCH_ON) break; =20 - case VIR_DOMAIN_HYPERV_STIMER: - if (value !=3D VIR_TRISTATE_SWITCH_ON) - break; + child =3D xmlFirstElementChild(node); + while (child) { + if (STRNEQ((const char *)child->name, "direct")) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported Hyper-V stimer feature: = %s"), + child->name); + return -1; + } =20 - child =3D xmlFirstElementChild(node); - while (child) { - if (STRNEQ((const char *)child->name, "direct")) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported Hyper-V stimer featu= re: %s"), - child->name); - return -1; - } + if (virXMLPropTristateSwitch(child, "state", VIR_XML_PROP_= REQUIRED, + &def->hyperv_stimer_direct) <= 0) + return -1; =20 - if (virXMLPropTristateSwitch(child, "state", - VIR_XML_PROP_REQUIRED, - &def->hyperv_stimer_direc= t) < 0) - return -1; + child =3D xmlNextElementSibling(child); + } + break; =20 - child =3D xmlNextElementSibling(child); - } + case VIR_DOMAIN_HYPERV_SPINLOCKS: + if (value !=3D VIR_TRISTATE_SWITCH_ON) break; =20 - case VIR_DOMAIN_HYPERV_SPINLOCKS: - if (value !=3D VIR_TRISTATE_SWITCH_ON) - break; + if (virXMLPropUInt(node, "retries", 0, VIR_XML_PROP_REQUIRED, + &def->hyperv_spinlocks) < 0) + return -1; =20 - if (virXMLPropUInt(node, "retries", 0, - VIR_XML_PROP_REQUIRED, - &def->hyperv_spinlocks) < 0) - return -1; + if (def->hyperv_spinlocks < 0xFFF) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("HyperV spinlock retry count must be at l= east 4095")); + return -1; + } + break; =20 - if (def->hyperv_spinlocks < 0xFFF) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("HyperV spinlock retry count must be " - "at least 4095")); - return -1; - } + case VIR_DOMAIN_HYPERV_VENDOR_ID: + if (value !=3D VIR_TRISTATE_SWITCH_ON) break; =20 - case VIR_DOMAIN_HYPERV_VENDOR_ID: - if (value !=3D VIR_TRISTATE_SWITCH_ON) - break; - - if (!(def->hyperv_vendor_id =3D virXMLPropString(node, - "value"))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing 'value' attribute for " - "HyperV feature 'vendor_id'")); - return -1; - } - - if (strlen(def->hyperv_vendor_id) > VIR_DOMAIN_HYPERV_VEND= OR_ID_MAX) { - virReportError(VIR_ERR_XML_ERROR, - _("HyperV vendor_id value must not be m= ore " - "than %d characters."), - VIR_DOMAIN_HYPERV_VENDOR_ID_MAX); - return -1; - } + if (!(def->hyperv_vendor_id =3D virXMLPropString(node, "value"= ))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing 'value' attribute for HyperV fea= ture 'vendor_id'")); + return -1; + } =20 - /* ensure that the string can be passed to qemu */ - if (strchr(def->hyperv_vendor_id, ',')) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("HyperV vendor_id value is invalid")); - return -1; - } - break; + if (strlen(def->hyperv_vendor_id) > VIR_DOMAIN_HYPERV_VENDOR_I= D_MAX) { + virReportError(VIR_ERR_XML_ERROR, + _("HyperV vendor_id value must not be more = than %d characters."), + VIR_DOMAIN_HYPERV_VENDOR_ID_MAX); + return -1; + } =20 - case VIR_DOMAIN_HYPERV_LAST: - break; + /* ensure that the string can be passed to qemu */ + if (strchr(def->hyperv_vendor_id, ',')) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("HyperV vendor_id value is invalid")); + return -1; } + break; =20 - node =3D xmlNextElementSibling(node); + case VIR_DOMAIN_HYPERV_LAST: + break; } + + node =3D xmlNextElementSibling(node); } =20 return 0; --=20 2.31.1