From nobody Thu Nov 20 14:08:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1763557782; cv=none; d=zohomail.com; s=zohoarc; b=U8JAKQb7BevW3SoYkWryuNms5KPGUX3Vfu1Sg0fYjnsQ+4DFHJLDLQqo1Z2Ryk1YcVhNyrhmNb8FEkDDjeaPVmj50l9MF/9R8gowm4plLWboTD/BTJm6UknfBlct/SYSNsWexv1m1blB6IsOLSyc5zpyPlw4Yw94BMHtMbeY9Ns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763557782; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tllD2ZsIo6gOfJev+IZeA8jqBYAlRgDihWUmymBakcU=; b=N9eU0xDzZFNyKuvr6WI6n5uzMFATNVmiedaweX78a4DmEE372gABpLd8bdpF14yEF88X8jX9qCx3BbQ080/noqX2GM3uRF05l/VTmYAFA3fs6xnTY4wZG+sNei8fsRrVDJMMc2Es66OjNF5b5HowFhKplwuL3xTEisMGTuLt1ck= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1763557782136570.3215361539199; Wed, 19 Nov 2025 05:09:42 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1165958.1492613 (Exim 4.92) (envelope-from ) id 1vLhvq-0003ic-78; Wed, 19 Nov 2025 13:09:10 +0000 Received: by outflank-mailman (output) from mailman id 1165958.1492613; Wed, 19 Nov 2025 13:09:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vLhvq-0003iV-4F; Wed, 19 Nov 2025 13:09:10 +0000 Received: by outflank-mailman (input) for mailman id 1165958; Wed, 19 Nov 2025 13:09:08 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vLhvo-0003iP-Iw for xen-devel@lists.xenproject.org; Wed, 19 Nov 2025 13:09:08 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ed5bf4fc-c548-11f0-9d18-b5c5bf9af7f9; Wed, 19 Nov 2025 14:09:07 +0100 (CET) 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 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) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ed5bf4fc-c548-11f0-9d18-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763557745; 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=eImq2/naRkM4GVvMhLR9EW9t3d4ojeKrjAR9ktSQ9fnP35GBKvo54p2Qnyk/UgxyryamI0 hTBaQ5WEk9JjRpbddN8is/DfdEGGgk8kEgdIvS7O4aVlZUg7oUrNyfjQAdCLVCvlXezAba R2kSN68YnCL13RQjhi2FDlj1UXo9ZF0= X-MC-Unique: xOlTkhEoOF61yJ6X7umJXA-1 X-Mimecast-MFC-AGG-ID: xOlTkhEoOF61yJ6X7umJXA_1763557741 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: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1763557783959158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Acked-by: Peter Xu Reviewed-by: Richard Henderson Reviewed-by: Vladimir Sementsov-Ogievskiy --- 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); =20 if (local_err || bsel >=3D 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)); } =20 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); =20 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 =3D NULL; - } + error_free(s->error); + s->error =3D NULL; } =20 static void migration_connect_set_error(MigrationState *s, const Error *er= ror) 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 SMPCon= figuration *config, config_str, expect_err, output_topo_str); =20 end: - if (err !=3D NULL) { - error_free(err); - } - + error_free(err); abort(); } =20 --=20 2.49.0