From nobody Thu May 16 02:28:37 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=1648132503; cv=none; d=zohomail.com; s=zohoarc; b=Qc7AbDnl6DP+2LBBHWBfI4kRPg9YtrVG0z3kSkbgDjytvL7/ACWRR3hwEgRyAzNiMec8uTl7m8rwXzxoGFc48I9hYeRdPRmqWuxC23BQF0WcCSRWhbGbo9HWW6THQ5FpqSHt2WfDwjbt4eYkBNd6+7ftZl/j/cmkoQznhqug3JA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648132503; h=Content-Type:Content-Transfer-Encoding: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=AXLgdxebY2/2g9tOc+FR59Q5cq5pbvD2eRNRlLokzYc=; b=croUEHiFy+K1FRZtja93bZ+c+XXec8zrdF8TTY6JaqChLEKE3Pg9dXRxsEtLbVVncjI7caU0kSBVO51KzHsa4zDLdK5qwCSyHLV2BiXrFMEeZZeF5hAhF924Ip9A10BYJ+iRUm3H8ooBvw0eX76alwzBNt5KGdZ3RgF2q5kGi7o= 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 1648132503340494.0102428204806; Thu, 24 Mar 2022 07:35:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-378-Gju73q9XMVm2dWocflak9g-1; Thu, 24 Mar 2022 10:34:23 -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 EA4E880419E; Thu, 24 Mar 2022 14:34:20 +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 8DB462024CD2; Thu, 24 Mar 2022 14:34:20 +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 ECF111940362; Thu, 24 Mar 2022 14:34:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6D52D194034B for ; Thu, 24 Mar 2022 14:34:17 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5E4667BEC0E; Thu, 24 Mar 2022 14:34:17 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 06B3A7BEC0D for ; Thu, 24 Mar 2022 14:34:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648132502; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=AXLgdxebY2/2g9tOc+FR59Q5cq5pbvD2eRNRlLokzYc=; b=RyNZzFga6SqEN1O42OI2avSnx3p3FC+VHJZfzuDQoykZ4YDHKsTYFo0jB+S4faHwDdio5b 2+up9WH0T/Bl0Bg6FrFtXDdwdyGOChN04CQYsJvn5flzzpPGPrPR5sLqKDBwEKP/jHoj0c Dl6ZZGc4JwvwlQQIUAZyIzkZjwQKrVQ= X-MC-Unique: Gju73q9XMVm2dWocflak9g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 1/2] qemu: remove unnecessary else branches after return / goto Date: Thu, 24 Mar 2022 15:34:07 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 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: 1648132504157100001 Content-Type: text/plain; charset="utf-8"; x-default="true" I think the code looks cleaner without else branches. Signed-off-by: Kristina Hanicova --- src/qemu/qemu_domainjob.c | 3 +-- src/qemu/qemu_migration.c | 13 +++++++------ src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_snapshot.c | 13 ++++++------- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index cf1e093e22..6bf3a0ab42 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -153,8 +153,7 @@ qemuDomainAsyncJobPhaseFromString(qemuDomainAsyncJob jo= b, =20 if (STREQ(phase, "none")) return 0; - else - return -1; + return -1; } =20 =20 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f109598fb4..e16d579928 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4286,9 +4286,10 @@ qemuMigrationSrcRun(virQEMUDriver *driver, rc =3D qemuMigrationSrcWaitForCompletion(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, dconn, waitFlags); - if (rc =3D=3D -2) { + if (rc =3D=3D -2) goto error; - } else if (rc =3D=3D -1) { + + if (rc =3D=3D -1) { /* QEMU reported failed migration, nothing to cancel anymore */ cancel =3D false; goto error; @@ -4326,9 +4327,10 @@ qemuMigrationSrcRun(virQEMUDriver *driver, rc =3D qemuMigrationSrcWaitForCompletion(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OU= T, dconn, waitFlags); - if (rc =3D=3D -2) { + if (rc =3D=3D -2) goto error; - } else if (rc =3D=3D -1) { + + if (rc =3D=3D -1) { /* QEMU reported failed migration, nothing to cancel anymore */ cancel =3D false; goto error; @@ -6189,8 +6191,7 @@ qemuMigrationDstErrorInit(virQEMUDriver *driver) driver->migrationErrors =3D virHashAtomicNew(qemuMigrationDstErrorFree= ); if (driver->migrationErrors) return 0; - else - return -1; + return -1; } =20 /** diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1ed60917ea..7a36f85d7e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8700,8 +8700,8 @@ qemuProcessRefreshBlockjobs(virQEMUDriver *driver, =20 if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) return qemuBlockJobRefreshJobs(driver, vm); - else - return qemuProcessRefreshLegacyBlockjobs(driver, vm); + + return qemuProcessRefreshLegacyBlockjobs(driver, vm); } =20 =20 diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 5333730df1..212d37d3b4 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -583,13 +583,12 @@ qemuSnapshotPrepareDiskExternal(virDomainObj *vm, _("missing existing file for disk %s:= %s"), snapdisk->name, snapdisk->src->path); return -1; - } else { - if (snapdisk->src->type =3D=3D VIR_STORAGE_TYPE_BLOCK) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("block device snapshot target '%s' do= esn't exist"), - snapdisk->src->path); - return -1; - } + } + if (snapdisk->src->type =3D=3D VIR_STORAGE_TYPE_BLOCK) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("block device snapshot target '%s' doesn'= t exist"), + snapdisk->src->path); + return -1; } } else { /* at this point VIR_STORAGE_TYPE_DIR was already rejected */ --=20 2.35.1 From nobody Thu May 16 02:28:37 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=1648132504; cv=none; d=zohomail.com; s=zohoarc; b=mcePKQ3xDcGo9qLDfa2YB9Jyk0Lb3He9cSnFlOdG9Ckp587TNw68IR8n8ukn4hn1Cl7ohdGTdk3Zb4lrdUPg1Lri9ZVgAGh/7U9mEx5tKGx2DChrmCngxQ9PMecDtuHDC7kf2EqraYOjnD/vO9GNprQASKipctWcZ+wO/6mBS9k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648132504; h=Content-Type:Content-Transfer-Encoding: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=dHa3+NzF+YXc285Puk2UByVH1sfGXERncWrMLBTBM5g=; b=hPbQ1NnNNchOdU0Uik6/R/i4YPR+YGVF125QtU/cQptmkXU4td0mENzJQLKEgSuYmyLkzIhcpgzqLNGjI1ft8VrwPrBGD5/IFXnu/ydzRVIhwXAGEHfKvL7mx7mYlrI8rLNejZel/DYfemVvMhf4tv94ExFVNJSmP71qKpnXBKE= 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 1648132504566162.30756342960763; Thu, 24 Mar 2022 07:35:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-656-TErsSFzbM1mLiO4UYEwVQQ-1; Thu, 24 Mar 2022 10:34:24 -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 29AA780378A; Thu, 24 Mar 2022 14:34:21 +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 1488C2024CD1; Thu, 24 Mar 2022 14:34:21 +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 18144194034F; Thu, 24 Mar 2022 14:34:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 230C6194034B for ; Thu, 24 Mar 2022 14:34:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id F005F7BEC0A; Thu, 24 Mar 2022 14:34:17 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97E7D7BEC0D for ; Thu, 24 Mar 2022 14:34:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648132503; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=dHa3+NzF+YXc285Puk2UByVH1sfGXERncWrMLBTBM5g=; b=HmRZbL+jk/dVZG2HhyN9do31j0DjT9hwjuZVAUWUACtkkQvU2OAs2/Rng3/tE+SwjX+bzu /KdaP5hZ5xVgtSOlv5A3x2fKjCAh2JTfyn5d4ZVXmC0r1WaUFlycC+6zKeWdAhHvfiQQ4b Yy17T50Jz6EcQTYszTjTvDJNUMvPwCs= X-MC-Unique: TErsSFzbM1mLiO4UYEwVQQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 2/2] qemu: remove else branches after return in qemuMigrationSrcPerform() Date: Thu, 24 Mar 2022 15:34:08 +0100 Message-Id: <93b2a3f071e6d1a6a9dc6d8595fe736e924567b5.1648132352.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 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: 1648132505897100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Kristina Hanicova --- src/qemu/qemu_migration.c | 46 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e16d579928..d8b00aca87 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5482,31 +5482,29 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, resource, v3proto); - } else { - if (dconnuri) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Unexpected dconnuri parameter with non= -peer2peer migration")); - return -1; - } - - if (v3proto) { - return qemuMigrationSrcPerformPhase(driver, conn, vm, persist_= xml, uri, - graphicsuri, - nmigrate_disks, migrate_di= sks, - migParams, - cookiein, cookieinlen, - cookieout, cookieoutlen, - flags, resource, nbdURI); - } else { - return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, per= sist_xml, NULL, - uri, graphicsuri, listenAddr= ess, - nmigrate_disks, migrate_disk= s, nbdPort, - nbdURI, migParams, - cookiein, cookieinlen, - cookieout, cookieoutlen, fla= gs, - dname, resource, v3proto); - } } + if (dconnuri) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Unexpected dconnuri parameter with non-pee= r2peer migration")); + return -1; + } + + if (v3proto) { + return qemuMigrationSrcPerformPhase(driver, conn, vm, persist_xml,= uri, + graphicsuri, + nmigrate_disks, migrate_disks, + migParams, + cookiein, cookieinlen, + cookieout, cookieoutlen, + flags, resource, nbdURI); + } + return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, persist_xml= , NULL, + uri, graphicsuri, listenAddress, + nmigrate_disks, migrate_disks, nbdPo= rt, + nbdURI, migParams, + cookiein, cookieinlen, + cookieout, cookieoutlen, flags, + dname, resource, v3proto); } =20 static int --=20 2.35.1