From nobody Thu Nov 14 07:13:42 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=1624364769; cv=none; d=zohomail.com; s=zohoarc; b=YaXDtnkUG49DY+ULFdBnEOKzSPuT7xZQ3xLwJ6DUs797LdVgPkkDQbEFWoJAsuocf/HFJXTdAPfoH5B7ZWIyW5R0s4jo5ZT/VA1OCw1i3vPiZVwksTZDiq4VBm7m0SU9+GJf+mRdCngBOVoDclsz237BrKo+r5kUnQSm/lHjlRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624364769; 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=XVfTB+VgAgon6SLiKd3ji6dmLT1oq0oO4ye4iqBFyfg=; b=KrfutHENYUaTAIPxLv1FP57aqVv3vLH1LFpKiegtYsCncg7sgHE2EHd397HFceBjG8jgTdir0GEHVKbbeIrx3otmyi8ZmkOLZIGj0QClnVMIkQDBDpEqzKhlzufAsl/BJhDFyRExbRLfZdqHK3k07DL5lf8tzuWKgBZf1xoQlvE= 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 1624364769005583.7774115800644; Tue, 22 Jun 2021 05:26:09 -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-94-tArecQ5lMMq42oAWesx-Zg-1; Tue, 22 Jun 2021 08:26:06 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2BEF8180C96C; Tue, 22 Jun 2021 12:26: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 065765DEFB; Tue, 22 Jun 2021 12:26: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 C07984EA3D; Tue, 22 Jun 2021 12:26: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 15MCNLIc005234 for ; Tue, 22 Jun 2021 08:23:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id B1EBE19C66; Tue, 22 Jun 2021 12:23:21 +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 0BACF19C46; Tue, 22 Jun 2021 12:23:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624364768; 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=XVfTB+VgAgon6SLiKd3ji6dmLT1oq0oO4ye4iqBFyfg=; b=FsYPSKZqnJU67yBKO5mtAtpYEWBLHKRuQAU2R82fxTmQcD56d0aTi2fKSEEpTOuTO87bx8 EKbFeBFyvUy08/18O+btln+2CqG62peTVgX6w56Rm+QbnyRk7ycOvdlqjSnRPmpT1SgxdS iG6gfpFwuKHrtXO+aE4Aqd01UggsHk4= X-MC-Unique: tArecQ5lMMq42oAWesx-Zg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 11/16] virDomainFeaturesXENDefParse: Remove tautological "if" Date: Tue, 22 Jun 2021 14:22:52 +0200 Message-Id: <20210622122257.12528-12-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.14 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 | 58 ++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 45c4b9cedf..02c06d5ab9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17436,47 +17436,45 @@ virDomainFeaturesXENDefParse(virDomainDef *def, { def->features[VIR_DOMAIN_FEATURE_XEN] =3D VIR_TRISTATE_SWITCH_ON; =20 - if (def->features[VIR_DOMAIN_FEATURE_XEN] =3D=3D VIR_TRISTATE_SWITCH_O= N) { + node =3D xmlFirstElementChild(node); + while (node) { int feature; virTristateSwitch value; =20 - node =3D xmlFirstElementChild(node); - while (node) { - feature =3D virDomainXenTypeFromString((const char *)node->nam= e); - if (feature < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported Xen feature: %s"), - node->name); - return -1; - } - - if (virXMLPropTristateSwitch(node, "state", - VIR_XML_PROP_REQUIRED, &value) < = 0) - return -1; + feature =3D virDomainXenTypeFromString((const char *)node->name); + if (feature < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported Xen feature: %s"), + node->name); + return -1; + } =20 - def->xen_features[feature] =3D value; + if (virXMLPropTristateSwitch(node, "state", + VIR_XML_PROP_REQUIRED, &value) < 0) + return -1; =20 - switch ((virDomainXen) feature) { - case VIR_DOMAIN_XEN_E820_HOST: - break; + def->xen_features[feature] =3D value; =20 - case VIR_DOMAIN_XEN_PASSTHROUGH: - if (value !=3D VIR_TRISTATE_SWITCH_ON) - break; + switch ((virDomainXen) feature) { + case VIR_DOMAIN_XEN_E820_HOST: + break; =20 - if (virXMLPropEnum(node, "mode", - virDomainXenPassthroughModeTypeFromStri= ng, - VIR_XML_PROP_NONZERO, - &def->xen_passthrough_mode) < 0) - return -1; + case VIR_DOMAIN_XEN_PASSTHROUGH: + if (value !=3D VIR_TRISTATE_SWITCH_ON) break; =20 - case VIR_DOMAIN_XEN_LAST: - break; - } + if (virXMLPropEnum(node, "mode", + virDomainXenPassthroughModeTypeFromString, + VIR_XML_PROP_NONZERO, + &def->xen_passthrough_mode) < 0) + return -1; + break; =20 - node =3D xmlNextElementSibling(node); + case VIR_DOMAIN_XEN_LAST: + break; } + + node =3D xmlNextElementSibling(node); } =20 return 0; --=20 2.31.1