From nobody Mon May 6 09:28:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1658322050; cv=none; d=zohomail.com; s=zohoarc; b=cTsfO5LSr9jEOBOxqH+cs9SwI4bmhIRsaiXm0J29t4ARRE7hzudVtiAfFgXNdOtdGRKM+zJmdcCdlXfw/Z8d6r38SuWnZflWij7XLb0CFW8dnlOifTvNzxRzJupIHMOqn6QopNwuvAgTNSmhxpZHi8CPCfUOy9pagZyCDzaK644= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658322050; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=RfQmMrUUOs5pRGv4wshl2BXKc32vj3KikOXz1vD1IFM=; b=JfxwQdihMldQkfD6+bMly8wfP3cniLoF/0183z7+sYevb0ekNDGDpGEEzf1+HZqGv8Unv99Ay92bEXpo6p4FPGL+Oqo6qdlTo3IvFPNIUvtCV1ovFYedx7E/AMM/03MfYxbxoy3qH9ho8ur8bs7hELLuZR6SXqpOnDgfHtHEuGA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1658322050499337.7523875245139; Wed, 20 Jul 2022 06:00:50 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-657-wXH4izI9MMGWRXpxI1um9Q-1; Wed, 20 Jul 2022 09:00:45 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BA9882813D39; Wed, 20 Jul 2022 13:00:38 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C1022026D64; Wed, 20 Jul 2022 13:00:38 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D68F4194706C; Wed, 20 Jul 2022 13:00:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 91D961947066 for ; Wed, 20 Jul 2022 13:00:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3711E2026987; Wed, 20 Jul 2022 13:00:01 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id D626E2026D64 for ; Wed, 20 Jul 2022 13:00:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658322049; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=RfQmMrUUOs5pRGv4wshl2BXKc32vj3KikOXz1vD1IFM=; b=G4zQJC18qt+z2D1aX2QsLYvcgqNMQDFAVYfQXhUZrBxTZNLGyWVgIKnAoSqhJDRNXDY9su MWVIWOUl5L4xACR4YnWnAeugmSpIV7u3wrcStrh/EITaojz6Qv5wLuQslGFeMoCSfBInkM gyST4qteunS1K+wF5bmlgQ9qPd18qtU= X-MC-Unique: wXH4izI9MMGWRXpxI1um9Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH] domain_conf: remove else after return / goto Date: Wed, 20 Jul 2022 14:59:58 +0200 Message-Id: <58c14ccfd4dc97be3930272f859e7e046d34e894.1658321985.git.khanicov@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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) X-ZM-MESSAGEID: 1658322051006100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Kristina Hanicova --- src/conf/domain_conf.c | 55 ++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 44a01ab628..bc4b74c1c8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4084,8 +4084,8 @@ virDomainObjGetPersistentDef(virDomainXMLOption *xmlo= pt, =20 if (domain->newDef) return domain->newDef; - else - return domain->def; + + return domain->def; } =20 =20 @@ -4223,8 +4223,8 @@ virDomainObjGetOneDefState(virDomainObj *vm, =20 if (virDomainObjIsActive(vm) && flags & VIR_DOMAIN_AFFECT_CONFIG) return vm->newDef; - else - return vm->def; + + return vm->def; } =20 =20 @@ -6029,7 +6029,9 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, VIR_XML_PROP_NONZERO, &scsisrc->sgio)) < 0) { return -1; - } else if (rv > 0) { + } + + if (rv > 0) { if (def->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SC= SI) { virReportError(VIR_ERR_XML_ERROR, "%s", _("sgio is only supported for scsi host device"= )); @@ -6041,8 +6043,9 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, VIR_XML_PROP_NONE, &scsisrc->rawio)) < 0) { return -1; - } else if (rv > 0 && - def->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE= _SCSI) { + } + + if (rv > 0 && def->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_T= YPE_SCSI) { virReportError(VIR_ERR_XML_ERROR, "%s", _("rawio is only supported for scsi host device")); return -1; @@ -8056,15 +8059,15 @@ virDomainControllerModelTypeFromString(const virDom= ainControllerDef *def, { if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI) return virDomainControllerModelSCSITypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) + if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) return virDomainControllerModelUSBTypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) + if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) return virDomainControllerModelPCITypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) + if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) return virDomainControllerModelIDETypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) + if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) return virDomainControllerModelVirtioSerialTypeFromString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_ISA) + if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_ISA) return virDomainControllerModelISATypeFromString(model); =20 return -1; @@ -8077,15 +8080,15 @@ virDomainControllerModelTypeToString(virDomainContr= ollerDef *def, { if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI) return virDomainControllerModelSCSITypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) + if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) return virDomainControllerModelUSBTypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) + if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) return virDomainControllerModelPCITypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) + if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) return virDomainControllerModelIDETypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) + if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) return virDomainControllerModelVirtioSerialTypeToString(model); - else if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_ISA) + if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_ISA) return virDomainControllerModelISATypeToString(model); =20 return NULL; @@ -9915,9 +9918,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef = *def, =20 ctxt->node =3D cur; =20 - if ((nsources =3D virXPathNodeSet("./source", ctxt, &sources)) < 0) { + if ((nsources =3D virXPathNodeSet("./source", ctxt, &sources)) < 0) goto error; - } else if (nsources > 0) { + + if (nsources > 0) { /* Parse only the first source element since only one is used * for chardev devices, the only exception is UDP type, where * user can specify two source elements. */ @@ -9926,7 +9930,8 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *= def, _("only one source element is allowed for " "character device")); goto error; - } else if (nsources > 2) { + } + if (nsources > 2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("only two source elements are allowed for " "character device")); @@ -10006,9 +10011,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDe= f *def, } } =20 - if ((nlogs =3D virXPathNodeSet("./log", ctxt, &logs)) < 0) { + if ((nlogs =3D virXPathNodeSet("./log", ctxt, &logs)) < 0) goto error; - } else if (nlogs =3D=3D 1) { + + if (nlogs =3D=3D 1) { if (virDomainChrSourceDefParseLog(def, logs[0]) < 0) goto error; } else if (nlogs > 1) { @@ -10018,9 +10024,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDe= f *def, goto error; } =20 - if ((nprotocols =3D virXPathNodeSet("./protocol", ctxt, &protocols)) <= 0) { + if ((nprotocols =3D virXPathNodeSet("./protocol", ctxt, &protocols)) <= 0) goto error; - } else if (nprotocols =3D=3D 1) { + + if (nprotocols =3D=3D 1) { if (virDomainChrSourceDefParseProtocol(def, protocols[0]) < 0) goto error; } else if (nprotocols > 1) { --=20 2.35.3