From nobody Sat Apr 20 11:31:23 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=1637685317; cv=none; d=zohomail.com; s=zohoarc; b=XiFTLl7ZiRofr/7YP1udAJ2+jFSbUFTdFmTq/EtsBrFWI7teekP3wEYnbO67rsKr21rbigVIZi6IEOBBwVtka3XldclMXxA6eQADabeRKNnG0Ok4+LSZBInVXtZD5YN+Dl8+rWLJO1edJ+uVZV9+BkT2DaEdEfN4O3t2ouwY3pQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637685317; 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=vYOgAhZ3y+VsuIRRuqfEp7nQMV4HckcVw6/Td2mx5Vc=; b=Um3i2vuKwKHEVJszi+ODv//ZoS1rasWPB0uEMy3usA9piQPmKtYjfqW3C35HBI/My0y+w6qtEtill0yk39rNavCoAlC07jEs9pxLEbk3IF9OA2kGyWi7PwvcgTKIzqeXNsYt6R1RYyVpYyKxdZHRFSMHt9m06Kd56xzvS/ahHM4= 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 1637685317611309.8081568998957; Tue, 23 Nov 2021 08:35:17 -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-527-CEyDdmRGNUqd9QpPWS7BQg-1; Tue, 23 Nov 2021 11:35:12 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 051CD1926DA0; Tue, 23 Nov 2021 16:35:07 +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 34D3726FC5; Tue, 23 Nov 2021 16:35:06 +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 0AE004A704; Tue, 23 Nov 2021 16:35:03 +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 1ANGZ0VM019899 for ; Tue, 23 Nov 2021 11:35:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id BC6315C1C5; Tue, 23 Nov 2021 16:35:00 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1EC525C1D5 for ; Tue, 23 Nov 2021 16:34:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637685314; 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=vYOgAhZ3y+VsuIRRuqfEp7nQMV4HckcVw6/Td2mx5Vc=; b=LFxpSnCOeBHo4HaGz7QkbRWuaCUA57CPB5iwq6IEger4l4BYZxEZ+ZLSLL34dopQCJYUIu SnVhGukYi6tMIaJ00wVtfKwVOGsZaKLexj7IpwZ8qxGh0ehgQSTrTTRTBuotSWwwgV3MS1 KlhDs6IOftAPNjJxnX5hM17O+58h7AU= X-MC-Unique: CEyDdmRGNUqd9QpPWS7BQg-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH] qemu: Remove unnecessary variables and labels Date: Tue, 23 Nov 2021 17:34:36 +0100 Message-Id: <8499aac58d960b3806a2a647eb78ca8b7b7b6967.1637685247.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.84 on 10.5.11.23 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: 1637685319984100003 Content-Type: text/plain; charset="utf-8" This patch removes variables such as 'ret', 'rc' and others which are easily replaced. Therefore, making the code look cleaner and easier to understand. Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- src/driver.c | 4 +-- src/qemu/qemu_agent.c | 4 +-- src/qemu/qemu_alias.c | 14 +++----- src/qemu/qemu_capabilities.c | 21 +++++------ src/qemu/qemu_cgroup.c | 7 ++-- src/qemu/qemu_conf.c | 15 ++++---- src/qemu/qemu_domain_address.c | 9 ++--- src/qemu/qemu_driver.c | 64 ++++++++++++---------------------- 8 files changed, 48 insertions(+), 90 deletions(-) diff --git a/src/driver.c b/src/driver.c index 329d493a50..9ae95cb4c3 100644 --- a/src/driver.c +++ b/src/driver.c @@ -52,7 +52,6 @@ virDriverLoadModule(const char *name, bool required) { g_autofree char *modfile =3D NULL; - int ret; =20 VIR_DEBUG("Module load %s", name); =20 @@ -64,8 +63,7 @@ virDriverLoadModule(const char *name, "LIBVIRT_DRIVER_DIR"))) return -1; =20 - ret =3D virModuleLoad(modfile, regfunc, required); - return ret; + return virModuleLoad(modfile, regfunc, required); } =20 =20 diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index c3b02569cd..08436a9705 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -176,7 +176,6 @@ qemuAgentOpenUnix(const char *socketpath) { struct sockaddr_un addr; int agentfd; - int ret =3D -1; =20 if ((agentfd =3D socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { virReportSystemError(errno, @@ -199,8 +198,7 @@ qemuAgentOpenUnix(const char *socketpath) goto error; } =20 - ret =3D connect(agentfd, (struct sockaddr *)&addr, sizeof(addr)); - if (ret < 0) { + if (connect(agentfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { virReportSystemError(errno, "%s", _("failed to connect to agent socket")); goto error; diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index a36f346592..5e35f43614 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -744,16 +744,13 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCap= s *qemuCaps) char * qemuAliasDiskDriveFromDisk(const virDomainDiskDef *disk) { - char *ret; - if (!disk->info.alias) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("disk does not have an alias")); return NULL; } =20 - ret =3D g_strdup_printf("%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.ali= as); - return ret; + return g_strdup_printf("%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alia= s); } =20 =20 @@ -780,18 +777,15 @@ qemuAliasDiskDriveSkipPrefix(const char *dev_name) char * qemuAliasFromHostdev(const virDomainHostdevDef *hostdev) { - char *ret; - if (!hostdev->info->alias) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("hostdev does not have an alias")); return NULL; } =20 - ret =3D g_strdup_printf("%s-%s", - virDomainDeviceAddressTypeToString(hostdev->info= ->type), - hostdev->info->alias); - return ret; + return g_strdup_printf("%s-%s", + virDomainDeviceAddressTypeToString(hostdev->inf= o->type), + hostdev->info->alias); } =20 =20 diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a4c492dde2..33797469a6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3070,7 +3070,6 @@ virQEMUCapsGetCPUFeatures(virQEMUCaps *qemuCaps, g_auto(GStrv) list =3D NULL; size_t i; size_t n; - int ret =3D -1; =20 *features =3D NULL; modelInfo =3D virQEMUCapsGetCPUModelInfo(qemuCaps, virtType); @@ -3091,12 +3090,10 @@ virQEMUCapsGetCPUFeatures(virQEMUCaps *qemuCaps, } =20 *features =3D g_steal_pointer(&list); - if (migratable && !modelInfo->migratability) - ret =3D 1; - else - ret =3D 0; =20 - return ret; + if (migratable && !modelInfo->migratability) + return 1; + return 0; } =20 =20 @@ -5237,15 +5234,13 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *= qemuCaps, virDomainVirtType virQEMUCapsGetVirtType(virQEMUCaps *qemuCaps) { - virDomainVirtType type; if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) - type =3D VIR_DOMAIN_VIRT_KVM; - else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_TCG)) - type =3D VIR_DOMAIN_VIRT_QEMU; - else - type =3D VIR_DOMAIN_VIRT_NONE; + return VIR_DOMAIN_VIRT_KVM; + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_TCG)) + return VIR_DOMAIN_VIRT_QEMU; =20 - return type; + return VIR_DOMAIN_VIRT_NONE; } =20 int diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 1e7b562b33..c07058d2f8 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -336,18 +336,15 @@ static int qemuSetupTPMCgroup(virDomainObj *vm, virDomainTPMDef *dev) { - int ret =3D 0; - switch (dev->type) { case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: - ret =3D qemuSetupChrSourceCgroup(vm, dev->data.passthrough.source); - break; + return qemuSetupChrSourceCgroup(vm, dev->data.passthrough.source); case VIR_DOMAIN_TPM_TYPE_EMULATOR: case VIR_DOMAIN_TPM_TYPE_LAST: break; } =20 - return ret; + return 0; } =20 =20 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 0451bc70ac..d31cd05ab4 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1915,16 +1915,13 @@ qemuGetBaseHugepagePath(virQEMUDriver *driver, virHugeTLBFS *hugepage) { const char *root =3D driver->embeddedRoot; - char *ret; =20 if (root && !STRPREFIX(hugepage->mnt_dir, root)) { g_autofree char * hash =3D virDomainDriverGenerateRootHash("qemu",= root); - ret =3D g_strdup_printf("%s/libvirt/%s", hugepage->mnt_dir, hash); - } else { - ret =3D g_strdup_printf("%s/libvirt/qemu", hugepage->mnt_dir); + return g_strdup_printf("%s/libvirt/%s", hugepage->mnt_dir, hash); } =20 - return ret; + return g_strdup_printf("%s/libvirt/qemu", hugepage->mnt_dir); } =20 =20 @@ -1935,11 +1932,11 @@ qemuGetDomainHugepagePath(virQEMUDriver *driver, { g_autofree char *base =3D qemuGetBaseHugepagePath(driver, hugepage); g_autofree char *domPath =3D virDomainDefGetShortName(def); - char *ret =3D NULL; =20 - if (base && domPath) - ret =3D g_strdup_printf("%s/%s", base, domPath); - return ret; + if (!base || !domPath) + return NULL; + + return g_strdup_printf("%s/%s", base, domPath); } =20 =20 diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 9abe2b84c8..22bf5d3b54 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2465,7 +2465,6 @@ static int qemuDomainAddressFindNewTargetIndex(virDomainDef *def) { int targetIndex; - int ret =3D -1; =20 /* Try all indexes between 1 and 31 - QEMU only supports 32 * PHBs, and 0 is reserved for the default, implicit one */ @@ -2490,13 +2489,11 @@ qemuDomainAddressFindNewTargetIndex(virDomainDef *d= ef) =20 /* If no existing PCI controller uses this index, great, * it means it's free and we can return it to the caller */ - if (!found) { - ret =3D targetIndex; - break; - } + if (!found) + return targetIndex; } =20 - return ret; + return -1; } =20 =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d954635dde..860c5b70a8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1332,7 +1332,6 @@ qemuGetSchedInfo(unsigned long long *cpuWait, g_autofree char *data =3D NULL; g_auto(GStrv) lines =3D NULL; size_t i; - int ret =3D -1; double val; =20 *cpuWait =3D 0; @@ -1344,21 +1343,19 @@ qemuGetSchedInfo(unsigned long long *cpuWait, else proc =3D g_strdup_printf("/proc/%d/sched", (int)pid); if (!proc) - goto cleanup; - ret =3D -1; + return -1; =20 /* The file is not guaranteed to exist (needs CONFIG_SCHED_DEBUG) */ if (access(proc, R_OK) < 0) { - ret =3D 0; - goto cleanup; + return 0; } =20 if (virFileReadAll(proc, (1<<16), &data) < 0) - goto cleanup; + return -1; =20 lines =3D g_strsplit(data, "\n", 0); if (!lines) - goto cleanup; + return -1; =20 for (i =3D 0; lines[i] !=3D NULL; i++) { const char *line =3D lines[i]; @@ -1372,7 +1369,7 @@ qemuGetSchedInfo(unsigned long long *cpuWait, virReportError(VIR_ERR_INTERNAL_ERROR, _("Missing separator in sched info '%s'"), lines[i]); - goto cleanup; + return -1; } line++; while (*line =3D=3D ' ') @@ -1382,7 +1379,7 @@ qemuGetSchedInfo(unsigned long long *cpuWait, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse sched info value '%s'"), line); - goto cleanup; + return -1; } =20 *cpuWait =3D (unsigned long long)(val * 1000000); @@ -1390,10 +1387,7 @@ qemuGetSchedInfo(unsigned long long *cpuWait, } } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3178,7 +3172,6 @@ doCoreDump(virQEMUDriver *driver, { int fd =3D -1; int ret =3D -1; - int rc =3D -1; virFileWrapperFd *wrapperFd =3D NULL; int directFlag =3D 0; bool needUnlink =3D false; @@ -3224,8 +3217,9 @@ doCoreDump(virQEMUDriver *driver, if (STREQ(memory_dump_format, "elf")) memory_dump_format =3D NULL; =20 - rc =3D qemuDumpToFd(driver, vm, fd, QEMU_ASYNC_JOB_DUMP, - memory_dump_format); + if (qemuDumpToFd(driver, vm, fd, QEMU_ASYNC_JOB_DUMP, + memory_dump_format) < 0) + goto cleanup; } else { if (dumpformat !=3D VIR_DOMAIN_CORE_DUMP_FORMAT_RAW) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", @@ -3237,13 +3231,11 @@ doCoreDump(virQEMUDriver *driver, if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0)) goto cleanup; =20 - rc =3D qemuMigrationSrcToFile(driver, vm, fd, compressor, - QEMU_ASYNC_JOB_DUMP); + if (qemuMigrationSrcToFile(driver, vm, fd, compressor, + QEMU_ASYNC_JOB_DUMP) < 0) + goto cleanup; } =20 - if (rc < 0) - goto cleanup; - if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("unable to close file %s"), @@ -7225,14 +7217,12 @@ qemuDomainUpdateDeviceLive(virDomainObj *vm, { virQEMUDriver *driver =3D dom->conn->privateData; virDomainDeviceDef oldDev =3D { .type =3D dev->type }; - int ret =3D -1; int idx; =20 switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: qemuDomainObjCheckDiskTaint(driver, vm, dev->data.disk, NULL); - ret =3D qemuDomainChangeDiskLive(vm, dev, driver, force); - break; + return qemuDomainChangeDiskLive(vm, dev, driver, force); =20 case VIR_DOMAIN_DEVICE_GRAPHICS: if ((idx =3D qemuDomainFindGraphicsIndex(vm->def, dev->data.graphi= cs)) >=3D 0) { @@ -7243,8 +7233,7 @@ qemuDomainUpdateDeviceLive(virDomainObj *vm, return -1; } =20 - ret =3D qemuDomainChangeGraphics(driver, vm, dev->data.graphics); - break; + return qemuDomainChangeGraphics(driver, vm, dev->data.graphics); =20 case VIR_DOMAIN_DEVICE_NET: if ((idx =3D virDomainNetFindIdx(vm->def, dev->data.net)) >=3D 0) { @@ -7255,12 +7244,10 @@ qemuDomainUpdateDeviceLive(virDomainObj *vm, return -1; } =20 - ret =3D qemuDomainChangeNet(driver, vm, dev); - break; + return qemuDomainChangeNet(driver, vm, dev); =20 case VIR_DOMAIN_DEVICE_MEMORY: - ret =3D qemuDomainChangeMemoryLive(driver, vm, dev); - break; + return qemuDomainChangeMemoryLive(driver, vm, dev); =20 case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_INPUT: @@ -7288,10 +7275,10 @@ qemuDomainUpdateDeviceLive(virDomainObj *vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("live update of device '%s' is not supported"), virDomainDeviceTypeToString(dev->type)); - break; + return -1; } =20 - return ret; + return -1; } =20 =20 @@ -9681,13 +9668,11 @@ qemuGetVcpusBWLive(virDomainObj *vm, { g_autoptr(virCgroup) cgroup_vcpu =3D NULL; qemuDomainObjPrivate *priv =3D NULL; - int rc; =20 priv =3D vm->privateData; if (!qemuDomainHasVcpuPids(vm)) { /* We do not create sub dir for each vcpu */ - rc =3D qemuGetVcpuBWLive(priv->cgroup, period, quota); - if (rc < 0) + if (qemuGetVcpuBWLive(priv->cgroup, period, quota) < 0) return -1; =20 if (*quota > 0) @@ -9700,8 +9685,7 @@ qemuGetVcpusBWLive(virDomainObj *vm, false, &cgroup_vcpu) < 0) return -1; =20 - rc =3D qemuGetVcpuBWLive(cgroup_vcpu, period, quota); - if (rc < 0) + if (qemuGetVcpuBWLive(cgroup_vcpu, period, quota) < 0) return -1; =20 return 0; @@ -9731,12 +9715,11 @@ qemuGetIOThreadsBWLive(virDomainObj *vm, { g_autoptr(virCgroup) cgroup_iothread =3D NULL; qemuDomainObjPrivate *priv =3D NULL; - int rc; =20 priv =3D vm->privateData; if (!vm->def->niothreadids) { /* We do not create sub dir for each iothread */ - if ((rc =3D qemuGetVcpuBWLive(priv->cgroup, period, quota)) < 0) + if (qemuGetVcpuBWLive(priv->cgroup, period, quota) < 0) return -1; =20 return 0; @@ -9748,8 +9731,7 @@ qemuGetIOThreadsBWLive(virDomainObj *vm, false, &cgroup_iothread) < 0) return -1; =20 - rc =3D qemuGetVcpuBWLive(cgroup_iothread, period, quota); - if (rc < 0) + if (qemuGetVcpuBWLive(cgroup_iothread, period, quota) < 0) return -1; =20 return 0; --=20 2.31.1