From nobody Thu Nov 14 06:57:50 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=1624364639; cv=none; d=zohomail.com; s=zohoarc; b=LyfO5AHVsl0wcOtjRjLPF8F2KyK34w7WLrQMXJC6ZEngWFDnPq2mdepPQXaDWVBouYJu1prqU8jmm3EKEAU6vpZLI1lQIu4/W0sYBl8kfgqffJd8QaV+P/SNxjDO+xfbch7uP4dhtZv6e8Q84QnaG6nN2gdzRR3IVtHrElewN8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624364639; 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=AtPTe1T7INb4vVSZIDBFWqskE/IZyt1B+qb31VnosnM=; b=CDxK3JuvJVr9dvqvOu/MuUMe3GGpzWjiyOoEFXOHVhNDIAldvuxP5P4L4G0yybGdMdYerle8tk5cqSwr+fIHE3DR4BrpE3pUhB2xJoL9qGlky5JSeTCA6rk81hC0jkmnB+2XL75b/BFsri/080z8U48XWtQtuqRC4w+fhDh+UmQ= 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 1624364639855335.81307283861395; Tue, 22 Jun 2021 05:23:59 -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-388-ttV2rrf4NtSd2sa2NvyNWg-1; Tue, 22 Jun 2021 08:23:56 -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 73E00804142; Tue, 22 Jun 2021 12:23:51 +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 45B565C1D1; Tue, 22 Jun 2021 12:23:51 +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 DAAFF4EA29; Tue, 22 Jun 2021 12:23:49 +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 15MCNCSX005185 for ; Tue, 22 Jun 2021 08:23:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3A61719D7C; Tue, 22 Jun 2021 12:23:12 +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 886D519C46; Tue, 22 Jun 2021 12:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624364638; 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=AtPTe1T7INb4vVSZIDBFWqskE/IZyt1B+qb31VnosnM=; b=himIGI/z3CHvBeCpnJhWuezsKSkqbpo7Y+J9ZNzboQFT+BfZEVj6sY5QV5FUigFJfnPgR+ eeXBaqZOHtQRQr3gbR/jl4itrE3cG6/IEPv053txL6aelznIo2U9aasPf7/DduZKWWp/Li oI+KGB9C6whk9cSh5Uam7tepXWNsOBE= X-MC-Unique: ttV2rrf4NtSd2sa2NvyNWg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 08/16] virDomainFeaturesKVMDefParse: Remove tautological "if" Date: Tue, 22 Jun 2021 14:22:49 +0200 Message-Id: <20210622122257.12528-9-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 | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 62565601ab..24529f3093 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17404,28 +17404,26 @@ virDomainFeaturesKVMDefParse(virDomainDef *def, { def->features[VIR_DOMAIN_FEATURE_KVM] =3D VIR_TRISTATE_SWITCH_ON; =20 - if (def->features[VIR_DOMAIN_FEATURE_KVM] =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 virDomainKVMTypeFromString((const char *)node->nam= e); - if (feature < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported KVM feature: %s"), - node->name); - return -1; - } + feature =3D virDomainKVMTypeFromString((const char *)node->name); + if (feature < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported KVM feature: %s"), + node->name); + return -1; + } =20 - if (virXMLPropTristateSwitch(node, "state", VIR_XML_PROP_REQUI= RED, - &value) < 0) - return -1; + if (virXMLPropTristateSwitch(node, "state", VIR_XML_PROP_REQUIRED, + &value) < 0) + return -1; =20 - def->kvm_features[feature] =3D value; + def->kvm_features[feature] =3D value; =20 - node =3D xmlNextElementSibling(node); - } + node =3D xmlNextElementSibling(node); } =20 return 0; --=20 2.31.1