From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 51D6FCF34AB for ; Wed, 19 Nov 2025 13:10:54 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLhvs-0008Uv-31; Wed, 19 Nov 2025 08:09:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLhvp-0008Tl-Rb for qemu-devel@nongnu.org; Wed, 19 Nov 2025 08:09:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLhvo-00036A-3G for qemu-devel@nongnu.org; Wed, 19 Nov 2025 08:09:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763557747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tllD2ZsIo6gOfJev+IZeA8jqBYAlRgDihWUmymBakcU=; b=Ln+E2UCmy+4FCHA/KuniUC81QUTUplnAJjicjFD8OrtQhSzsoSfbJvjIKZsQY7GkQ6tg+a Ix1Q/SVVCKZNLyJkpdzoL+TNXR/160j/5WYRga3QvY5kGgMNossIUosqJM2Ee1SxJSwxxI GQU1w0TpN3WHAuTslzsrAjTxJ7tCc1o= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-606-xOlTkhEoOF61yJ6X7umJXA-1; Wed, 19 Nov 2025 08:09:04 -0500 X-MC-Unique: xOlTkhEoOF61yJ6X7umJXA-1 X-Mimecast-MFC-AGG-ID: xOlTkhEoOF61yJ6X7umJXA_1763557741 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4A0641800372; Wed, 19 Nov 2025 13:09:00 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.18]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4F924300A88D; Wed, 19 Nov 2025 13:08:58 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 89E3A21E66F8; Wed, 19 Nov 2025 14:08:55 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, gengdongjiu1@gmail.com, peter.maydell@linaro.org, alistair@alistair23.me, edgar.iglesias@gmail.com, npiggin@gmail.com, harshpb@linux.ibm.com, palmer@dabbelt.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, berrange@redhat.com, peterx@redhat.com, farosas@suse.de, eblake@redhat.com, vsementsov@yandex-team.ru, eduardo@habkost.net, marcel.apfelbaum@gmail.com, philmd@linaro.org, wangyanan55@huawei.com, zhao1.liu@intel.com, qemu-block@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, xen-devel@lists.xenproject.org Subject: [PATCH 4/5] error: error_free(NULL) is safe, drop unnecessary conditionals Date: Wed, 19 Nov 2025 14:08:54 +0100 Message-ID: <20251119130855.105479-5-armbru@redhat.com> In-Reply-To: <20251119130855.105479-1-armbru@redhat.com> References: <20251119130855.105479-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Markus Armbruster --- hw/acpi/pcihp.c | 4 +--- io/channel-websock.c | 4 +--- io/task.c | 4 +--- migration/migration.c | 6 ++---- tests/unit/test-smp-parse.c | 5 +---- 5 files changed, 6 insertions(+), 17 deletions(-) diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 4922bbc778..87162ff2c0 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -62,9 +62,7 @@ static int acpi_pcihp_get_bsel(PCIBus *bus) &local_err); if (local_err || bsel >= ACPI_PCIHP_MAX_HOTPLUG_BUS) { - if (local_err) { - error_free(local_err); - } + error_free(local_err); return -1; } else { return bsel; diff --git a/io/channel-websock.c b/io/channel-websock.c index cb4dafdebb..d0929ba232 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -932,9 +932,7 @@ static void qio_channel_websock_finalize(Object *obj) if (ioc->io_tag) { g_source_remove(ioc->io_tag); } - if (ioc->io_err) { - error_free(ioc->io_err); - } + error_free(ioc->io_err); object_unref(OBJECT(ioc->master)); } diff --git a/io/task.c b/io/task.c index 451f26f8b4..da79d31782 100644 --- a/io/task.c +++ b/io/task.c @@ -91,9 +91,7 @@ static void qio_task_free(QIOTask *task) if (task->destroyResult) { task->destroyResult(task->result); } - if (task->err) { - error_free(task->err); - } + error_free(task->err); object_unref(task->source); qemu_mutex_unlock(&task->thread_lock); diff --git a/migration/migration.c b/migration/migration.c index c2daab6bdd..3160e24220 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1569,10 +1569,8 @@ bool migrate_has_error(MigrationState *s) static void migrate_error_free(MigrationState *s) { QEMU_LOCK_GUARD(&s->error_mutex); - if (s->error) { - error_free(s->error); - s->error = NULL; - } + error_free(s->error); + s->error = NULL; } static void migration_connect_set_error(MigrationState *s, const Error *error) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 326045ecbb..34082c1465 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -875,10 +875,7 @@ static void check_parse(MachineState *ms, const SMPConfiguration *config, config_str, expect_err, output_topo_str); end: - if (err != NULL) { - error_free(err); - } - + error_free(err); abort(); } -- 2.49.0