From nobody Mon Feb 9 00:19:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767792197; cv=none; d=zohomail.com; s=zohoarc; b=bhEMobb3m7TvzMXxj1NZ6YOOjiyPStFmH/kwViQCqZ4FlzdO8/nmyVSTZTvsIUimxasuqdFA9RW/uiDKR5HHxWI3+lHFRgw9XUWPJMgOdDzRGfCkNUhlmJR2lrejDaBXnGP07daJnXZ2vHFWYktLLimIvfFI1rDQs0ccQ7dR2js= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767792197; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Resent-Date:Resent-To:References:Resent-Message-ID:Resent-From:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=oQeg/ax1yqZCNF/kck2njGvRd7LL1zM9VleD8rDKBvQ=; b=nbuhhAVwma4QyHjiNuUZEJE1wVQYFgaHwY1EUs+eEmp4JeUUkSVV3xqc/UBTxkAwvvVmSAtoga0BohwZWF4QsDSZesJNhXIbbhPyWFx648bg8o8q1Napzu9jQm9vcmgBDgFQAEAWuL33uXTqID/naTgubeojFaca3aALkcFh1No= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767792197925495.6888379853499; Wed, 7 Jan 2026 05:23:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdTV8-0004Yi-NZ; Wed, 07 Jan 2026 08:23:04 -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 1vdTUk-0004Rh-7Z for qemu-devel@nongnu.org; Wed, 07 Jan 2026 08:22:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdTUg-00053E-Dv for qemu-devel@nongnu.org; Wed, 07 Jan 2026 08:22:37 -0500 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-361-ZYLnzWUfPTiiytBiLyOFEA-1; Wed, 07 Jan 2026 08:22:31 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 34CC11800447; Wed, 7 Jan 2026 13:22:29 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BB123180066A; Wed, 7 Jan 2026 13:22:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9F90A21E6937; Wed, 07 Jan 2026 14:22:26 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3F2C621E61AA; Wed, 07 Jan 2026 13:43:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767792152; 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:resent-to: resent-from:resent-message-id:in-reply-to:in-reply-to: references:references; bh=oQeg/ax1yqZCNF/kck2njGvRd7LL1zM9VleD8rDKBvQ=; b=Ah7MScwx1A6WS1dAOlL0reHqeELavp6xK8xwAG9Gv5ibLUIQM6/+w9toIdAr5xevdkIfKB iD09hA3BQcL4qQzy/Nu6euwk+gqZtz/QhSmfZ0Ze7UbBCMOF7UnnNwkR4z0P58GwdnY6ef C0XCG7C1WtDX9EyA2+psCJNmcLFlE0g= X-MC-Unique: ZYLnzWUfPTiiytBiLyOFEA-1 X-Mimecast-MFC-AGG-ID: ZYLnzWUfPTiiytBiLyOFEA_1767792149 Resent-To: zhao1.liu@intel.com, richard.henderson@linaro.org, qemu-devel@nongnu.org, vsementsov@yandex-team.ru Resent-From: Markus Armbruster Resent-Date: Wed, 07 Jan 2026 14:22:26 +0100 Resent-Message-ID: <871pk1k165.fsf@pond.sub.org> X-From-Line: armbru@redhat.com Wed Jan 7 13:43:41 2026 X-Original-To: armbru From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, Vladimir Sementsov-Ogievskiy , Peter Xu , Zhao Liu Subject: [PULL 04/17] error: error_free(NULL) is safe, drop unnecessary conditionals Date: Wed, 7 Jan 2026 13:43:28 +0100 Message-ID: <20260107124341.1093312-5-armbru@redhat.com> In-Reply-To: <20260107124341.1093312-1-armbru@redhat.com> References: <20260107124341.1093312-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Lines: 96 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.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_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767792198723158501 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Message-ID: <20251119130855.105479-5-armbru@redhat.com> Reviewed-by: Richard Henderson Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Peter Xu Reviewed-by: Zhao Liu --- 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 9d1bf5d276..1c34d8d432 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1568,10 +1568,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_error_propagate(MigrationState *s, Error *er= ror) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 28ea9158e7..1b6450e7d8 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.52.0