From nobody Tue Apr 23 21:52:32 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=1637688029; cv=none; d=zohomail.com; s=zohoarc; b=UJMLWt80zB0mpnPY2z59aNobSYf4ub6q2WUyF2dNwUqgydw6tgbScC9YrPS1PLYyPUhoGpSh8qpHqcWayjZiBlzrTZKSrTRS+76SqYCH/hKQK+tzIhau3Wc2Nk0PHK74xrz2WJsLfpVBcdeDs5hzqTLotNn9hBcm73YCHhYtBwo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637688029; 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=U8Pf+fDudC1vOHL/N+Pwr36vBNPfLIThCSs0jFwXzGM=; b=XlFrO41mhgGyuPDwFysLHywhvBsfpuuOZcXi494hxso88rbBc6TNVF54xS3+9C5cJ32Ruc3ISU6GLS3mMjrRcS9PiJuJoAVfjDE07lzqy5gOnSm+Goz+QCqU0IB2Z2OgaGj9tmXhHj04FWpOzTu9aGIYaMEVWaUtDpqiRU9xx30= 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 1637688029579185.38465920180715; Tue, 23 Nov 2021 09:20:29 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-262-J1KdH13tOZCeXa7gQi4vvQ-1; Tue, 23 Nov 2021 12:20:23 -0500 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 8847C57000; Tue, 23 Nov 2021 17:20:17 +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 497015C232; Tue, 23 Nov 2021 17:20:17 +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 B9F941832E7F; Tue, 23 Nov 2021 17:20:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1ANHKFqh024368 for ; Tue, 23 Nov 2021 12:20:15 -0500 Received: by smtp.corp.redhat.com (Postfix) id 51FE85C232; Tue, 23 Nov 2021 17:20:15 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7F035C1D5 for ; Tue, 23 Nov 2021 17:20:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637688028; 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=U8Pf+fDudC1vOHL/N+Pwr36vBNPfLIThCSs0jFwXzGM=; b=JqF2Rx8uAmtAqJN0vUzo++h4ACnMmSdla4tvLTqyYOQRMrpRY+QJuVpMIWFhD89eqo4QiK K+cznY0NXmbHalz4Vo3/sD3r/pUaPynk31IuHk7Y7ng98ECySBNOGOQeJuDawqX8KFribT gdkIHdhj45K5q6+ZgoTCf/pVd8xFvhE= X-MC-Unique: J1KdH13tOZCeXa7gQi4vvQ-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH] qemu: Remove 'else' branches after 'return' or 'goto' Date: Tue, 23 Nov 2021 18:20:10 +0100 Message-Id: <695ad71d9b7ad935432b25cbaa44af6b39f452c8.1637687949.git.khanicov@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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) X-ZM-MESSAGEID: 1637688030437100003 Content-Type: text/plain; charset="utf-8" I think it makes no sense to have else branches after return or goto as it will never reach them in cases it should not. This patch makes the code more readable (at least to me). Signed-off-by: Kristina Hanicova --- src/libvirt.c | 3 ++- src/qemu/qemu_agent.c | 6 +++--- src/qemu/qemu_alias.c | 9 +++++---- src/qemu/qemu_capabilities.c | 4 ++-- src/qemu/qemu_cgroup.c | 9 +++------ src/qemu/qemu_conf.c | 11 +++++------ src/qemu/qemu_domain_address.c | 11 +++++------ src/qemu/qemu_domainjob.c | 3 +-- src/qemu/qemu_driver.c | 32 ++++++++++++++++---------------- 9 files changed, 42 insertions(+), 46 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 80bdcd1db3..ef9fc403d0 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -663,7 +663,8 @@ virStateInitialize(bool privileged, virStateDriverTab[i]->name, virGetLastErrorMessage()); return -1; - } else if (ret =3D=3D VIR_DRV_STATE_INIT_SKIPPED && mandatory)= { + } + if (ret =3D=3D VIR_DRV_STATE_INIT_SKIPPED && mandatory) { VIR_ERROR(_("Initialization of mandatory %s state driver s= kipped"), virStateDriverTab[i]->name); return -1; diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index c3b02569cd..75eb1620c0 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -989,8 +989,7 @@ qemuAgentCommandName(virJSONValue *cmd) const char *name =3D virJSONValueObjectGetString(cmd, "execute"); if (name) return name; - else - return ""; + return ""; } =20 static int @@ -1029,7 +1028,8 @@ qemuAgentCheckError(virJSONValue *cmd, qemuAgentStringifyError(error)); =20 return -1; - } else if (!virJSONValueObjectHasKey(reply, "return")) { + } + if (!virJSONValueObjectHasKey(reply, "return")) { g_autofree char *cmdstr =3D virJSONValueToString(cmd, false); g_autofree char *replystr =3D virJSONValueToString(reply, false); =20 diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index a36f346592..5b525415de 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -137,7 +137,8 @@ qemuAssignDeviceControllerAlias(virDomainDef *domainDef, */ controller->info.alias =3D g_strdup("pci"); return 0; - } else if (controller->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PC= IE_ROOT) { + } + if (controller->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT= ) { /* The pcie-root controller on Q35 machinetypes uses a * different naming convention ("pcie.0"), because it is * hardcoded that way in qemu. @@ -151,7 +152,8 @@ qemuAssignDeviceControllerAlias(virDomainDef *domainDef, */ controller->info.alias =3D g_strdup_printf("pci.%d", controller->i= dx); return 0; - } else if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) { + } + if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) { /* for any machine based on e.g. I440FX or G3Beige, the * first (and currently only) IDE controller is an integrated * controller hardcoded with id "ide" @@ -821,8 +823,7 @@ qemuAliasForSecret(const char *parentalias, { if (obj) return g_strdup_printf("%s-%s-secret0", parentalias, obj); - else - return g_strdup_printf("%s-secret0", parentalias); + return g_strdup_printf("%s-secret0", parentalias); } =20 /* qemuAliasTLSObjFromSrcAlias diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a4c492dde2..3b63996170 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -773,9 +773,9 @@ const char *virQEMUCapsArchToString(virArch arch) { if (arch =3D=3D VIR_ARCH_I686) return "i386"; - else if (arch =3D=3D VIR_ARCH_ARMV6L || arch =3D=3D VIR_ARCH_ARMV7L) + if (arch =3D=3D VIR_ARCH_ARMV6L || arch =3D=3D VIR_ARCH_ARMV7L) return "arm"; - else if (arch =3D=3D VIR_ARCH_OR32) + if (arch =3D=3D VIR_ARCH_OR32) return "or32"; =20 return virArchToString(arch); diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 1e7b562b33..bcdfa90759 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -608,9 +608,8 @@ qemuSetupBlkioCgroup(virDomainObj *vm) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Block I/O tuning is not available on this ho= st")); return -1; - } else { - return 0; } + return 0; } =20 return virDomainCgroupSetupBlkio(priv->cgroup, vm->def->blkio); @@ -629,9 +628,8 @@ qemuSetupMemoryCgroup(virDomainObj *vm) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Memory cgroup is not available on this host"= )); return -1; - } else { - return 0; } + return 0; } =20 return virDomainCgroupSetupMemtune(priv->cgroup, vm->def->mem); @@ -891,9 +889,8 @@ qemuSetupCpuCgroup(virDomainObj *vm) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("CPU tuning is not available on this host")); return -1; - } else { - return 0; } + return 0; } =20 if (vm->def->cputune.sharesSpecified) { diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 0451bc70ac..bbb05a4e81 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1001,12 +1001,12 @@ virQEMUDriverConfigLoadMemoryEntry(virQEMUDriverCon= fig *cfg, g_autofree char *dir =3D NULL; int rc; =20 - if ((rc =3D virConfGetValueString(conf, "memory_backing_dir", &dir)) <= 0) { + if ((rc =3D virConfGetValueString(conf, "memory_backing_dir", &dir)) <= 0) return -1; - } else if (rc > 0) { + + if (rc > 0) { VIR_FREE(cfg->memoryBackingDir); cfg->memoryBackingDir =3D g_strdup_printf("%s/libvirt/qemu", dir); - return 0; } =20 return 0; @@ -1777,11 +1777,10 @@ qemuSharedDeviceAddRemoveInternal(virQEMUDriver *dr= iver, if (dev->type =3D=3D VIR_DOMAIN_DEVICE_DISK) return qemuSharedDiskAddRemoveInternal(driver, dev->data.disk, name, addDevice); - else if (dev->type =3D=3D VIR_DOMAIN_DEVICE_HOSTDEV) + if (dev->type =3D=3D VIR_DOMAIN_DEVICE_HOSTDEV) return qemuSharedHostdevAddRemoveInternal(driver, dev->data.hostde= v, name, addDevice); - else - return 0; + return 0; } =20 =20 diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 9abe2b84c8..2948630b75 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -58,13 +58,13 @@ qemuDomainGetSCSIControllerModel(const virDomainDef *de= f, =20 if (qemuDomainIsPSeries(def)) return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI; - else if (ARCH_IS_S390(def->os.arch)) + if (ARCH_IS_S390(def->os.arch)) return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI; - else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC; - else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_SCSI)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_SCSI)) return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI; - else if (qemuDomainHasBuiltinESP(def)) + if (qemuDomainHasBuiltinESP(def)) return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_NCR53C90; =20 virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1589,9 +1589,8 @@ qemuDomainCollectPCIAddress(virDomainDef *def G_GNUC_= UNUSED, _("Bus 0 must be PCI for integrated PIIX3 " "USB or IDE controllers")); return -1; - } else { - return 0; } + return 0; } } =20 diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 03a8d9ba5f..cff8d7bb83 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -1036,8 +1036,7 @@ int qemuDomainObjBeginJob(virQEMUDriver *driver, QEMU_AGENT_JOB_NONE, QEMU_ASYNC_JOB_NONE, false) < 0) return -1; - else - return 0; + return 0; } =20 /** diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 16d449913c..437bf63cd4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1819,7 +1819,8 @@ static int qemuDomainSuspend(virDomainPtr dom) virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is pmsuspended")); goto endjob; - } else if (state !=3D VIR_DOMAIN_PAUSED) { + } + if (state !=3D VIR_DOMAIN_PAUSED) { if (qemuProcessStopCPUs(driver, vm, reason, QEMU_ASYNC_JOB_NONE) <= 0) goto endjob; } @@ -1861,13 +1862,15 @@ static int qemuDomainResume(virDomainPtr dom) virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is pmsuspended")); goto endjob; - } else if (state =3D=3D VIR_DOMAIN_RUNNING) { + } + if (state =3D=3D VIR_DOMAIN_RUNNING) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is already running")); goto endjob; - } else if ((state =3D=3D VIR_DOMAIN_CRASHED && - reason =3D=3D VIR_DOMAIN_CRASHED_PANICKED) || - state =3D=3D VIR_DOMAIN_PAUSED) { + } + if ((state =3D=3D VIR_DOMAIN_CRASHED && + reason =3D=3D VIR_DOMAIN_CRASHED_PANICKED) || + state =3D=3D VIR_DOMAIN_PAUSED) { if (qemuProcessStartCPUs(driver, vm, VIR_DOMAIN_RUNNING_UNPAUSED, QEMU_ASYNC_JOB_NONE) < 0) { @@ -16358,9 +16361,9 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, *nparams =3D maxparams; ret =3D 0; goto endjob; - } else if (*nparams < maxparams) { - maxparams =3D *nparams; } + if (*nparams < maxparams) + maxparams =3D *nparams; =20 *nparams =3D 0; =20 @@ -20428,29 +20431,26 @@ qemuDomainGetGuestInfo(virDomainPtr dom, =20 if (supportedTypes & VIR_DOMAIN_GUEST_INFO_FILESYSTEM) { rc =3D qemuAgentGetFSInfo(agent, &agentfsinfo, report_unsupported); - if (rc =3D=3D -1) { + if (rc =3D=3D -1) goto exitagent; - } else if (rc >=3D 0) { + if (rc >=3D 0) nfs =3D rc; - } } =20 if (supportedTypes & VIR_DOMAIN_GUEST_INFO_DISKS) { rc =3D qemuAgentGetDisks(agent, &agentdiskinfo, report_unsupported= ); - if (rc =3D=3D -1) { + if (rc =3D=3D -1) goto exitagent; - } else if (rc >=3D 0) { + if (rc >=3D 0) ndisks =3D rc; - } } =20 if (supportedTypes & VIR_DOMAIN_GUEST_INFO_INTERFACES) { rc =3D qemuAgentGetInterfaces(agent, &ifaces, report_unsupported); - if (rc =3D=3D -1) { + if (rc =3D=3D -1) goto exitagent; - } else if (rc >=3D 0) { + if (rc >=3D 0) nifaces =3D rc; - } } =20 qemuDomainObjExitAgent(vm, agent); --=20 2.31.1