From nobody Fri Apr 4 06:28:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1742178612649547.6881993927775; Sun, 16 Mar 2025 19:30:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tu0EZ-0002ye-HL; Sun, 16 Mar 2025 22:29:43 -0400 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 1tu0EX-0002xq-DW for qemu-devel@nongnu.org; Sun, 16 Mar 2025 22:29:41 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tu0EV-00032t-Bv for qemu-devel@nongnu.org; Sun, 16 Mar 2025 22:29:41 -0400 Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8BxlmkOiddntE+ZAA--.63108S3; Mon, 17 Mar 2025 10:29:34 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowMCxbsUDiddn1ZVOAA--.28932S4; Mon, 17 Mar 2025 10:29:34 +0800 (CST) From: Bibo Mao To: Song Gao Cc: Jiaxun Yang , qemu-devel@nongnu.org, Markus Armbruster , Paolo Bonzini Subject: [PATCH v3 2/3] hw/loongarch/virt: Remove unnecessary NULL pointer Date: Mon, 17 Mar 2025 10:29:21 +0800 Message-Id: <20250317022922.802988-3-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250317022922.802988-1-maobibo@loongson.cn> References: <20250317022922.802988-1-maobibo@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowMCxbsUDiddn1ZVOAA--.28932S4 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== 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=114.242.206.163; envelope-from=maobibo@loongson.cn; helo=mail.loongson.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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-ZM-MESSAGEID: 1742178616121019100 Content-Type: text/plain; charset="utf-8" There is NULL pointer checking function error_propagate() already, it is not necessary to add checking for function parameter. Here remove NULL pointer checking with function parameter. Since function will return directly when there is error report, this patch removes combination about error_setg() and error_propagate(), error_setg() with dest error object is used directly such as: error_setg(err); --------> error_setg(errp); error_propagate(errp, err); return; return; Signed-off-by: Bibo Mao --- hw/loongarch/virt.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index a5840ff968..1fd91f94b5 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -865,24 +865,24 @@ static void virt_cpu_pre_plug(HotplugHandler *hotplug= _dev, =20 if (lvms->acpi_ged) { if ((cpu->thread_id < 0) || (cpu->thread_id >=3D ms->smp.threads))= { - error_setg(&err, + error_setg(errp, "Invalid thread-id %u specified, must be in range 1= :%u", cpu->thread_id, ms->smp.threads - 1); - goto out; + return; } =20 if ((cpu->core_id < 0) || (cpu->core_id >=3D ms->smp.cores)) { - error_setg(&err, + error_setg(errp, "Invalid core-id %u specified, must be in range 1:%= u", cpu->core_id, ms->smp.cores - 1); - goto out; + return; } =20 if ((cpu->socket_id < 0) || (cpu->socket_id >=3D ms->smp.sockets))= { - error_setg(&err, + error_setg(errp, "Invalid socket-id %u specified, must be in range 1= :%u", cpu->socket_id, ms->smp.sockets - 1); - goto out; + return; } =20 topo.socket_id =3D cpu->socket_id; @@ -891,11 +891,11 @@ static void virt_cpu_pre_plug(HotplugHandler *hotplug= _dev, arch_id =3D virt_get_arch_id_from_topo(ms, &topo); cpu_slot =3D virt_find_cpu_slot(ms, arch_id); if (CPU(cpu_slot->cpu)) { - error_setg(&err, + error_setg(errp, "cpu(id%d=3D%d:%d:%d) with arch-id %" PRIu64 " exis= ts", cs->cpu_index, cpu->socket_id, cpu->core_id, cpu->thread_id, cpu_slot->arch_id); - goto out; + return; } } else { /* For cold-add cpu, find empty cpu slot */ @@ -912,10 +912,6 @@ static void virt_cpu_pre_plug(HotplugHandler *hotplug_= dev, cpu->phy_id =3D cpu_slot->arch_id; cs->cpu_index =3D cpu_slot - ms->possible_cpus->cpus; numa_cpu_pre_plug(cpu_slot, dev, &err); -out: - if (err) { - error_propagate(errp, err); - } } =20 static void virt_cpu_unplug_request(HotplugHandler *hotplug_dev, @@ -927,17 +923,14 @@ static void virt_cpu_unplug_request(HotplugHandler *h= otplug_dev, CPUState *cs =3D CPU(dev); =20 if (cs->cpu_index =3D=3D 0) { - error_setg(&err, "hot-unplug of boot cpu(id%d=3D%d:%d:%d) not supp= orted", + error_setg(errp, "hot-unplug of boot cpu(id%d=3D%d:%d:%d) not supp= orted", cs->cpu_index, cpu->socket_id, cpu->core_id, cpu->thread_id); - error_propagate(errp, err); return; } =20 hotplug_handler_unplug_request(HOTPLUG_HANDLER(lvms->acpi_ged), dev, &= err); - if (err) { - error_propagate(errp, err); - } + error_propagate(errp, err); } =20 static void virt_cpu_unplug(HotplugHandler *hotplug_dev, @@ -1003,6 +996,7 @@ static void virt_cpu_plug(HotplugHandler *hotplug_dev, hotplug_handler_plug(HOTPLUG_HANDLER(lvms->acpi_ged), dev, &err); if (err) { error_propagate(errp, err); + return; } } =20 --=20 2.39.3