From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: stefanha@redhat.com, Bibo Mao <maobibo@loongson.cn>
Subject: [PULL 8/8] target/loongarch: Clean up virt_cpu_irq_init() error handling
Date: Fri, 21 Mar 2025 15:51:58 +0100 [thread overview]
Message-ID: <20250321145158.3896812-9-armbru@redhat.com> (raw)
In-Reply-To: <20250321145158.3896812-1-armbru@redhat.com>
From: Bibo Mao <maobibo@loongson.cn>
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.
virt_cpu_irq_init() is wrong that way: it passes &err to
hotplug_handler_plug() twice. If both calls failed, this could trip
error_setv()'s assertion. Moreover, if just one fails, the Error
object leaks. Fortunately, these calls can't actually fail.
Messed up in commit 50ebc3fc47f7 (hw/intc/loongarch_ipi: Notify ipi
object when cpu is plugged) and commit 087a23a87c57
(hw/intc/loongarch_extioi: Use cpu plug notification).
Clean this up by passing &error_abort instead.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Acked-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20250320032158.1762751-7-maobibo@loongson.cn>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/loongarch/virt.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 4674bd9163..63477de5e4 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -327,7 +327,6 @@ static void virt_cpu_irq_init(LoongArchVirtMachineState *lvms)
MachineClass *mc = MACHINE_GET_CLASS(ms);
const CPUArchIdList *possible_cpus;
CPUState *cs;
- Error *err = NULL;
/* cpu nodes */
possible_cpus = mc->possible_cpu_arch_ids(ms);
@@ -337,8 +336,10 @@ static void virt_cpu_irq_init(LoongArchVirtMachineState *lvms)
continue;
}
- hotplug_handler_plug(HOTPLUG_HANDLER(lvms->ipi), DEVICE(cs), &err);
- hotplug_handler_plug(HOTPLUG_HANDLER(lvms->extioi), DEVICE(cs), &err);
+ hotplug_handler_plug(HOTPLUG_HANDLER(lvms->ipi), DEVICE(cs),
+ &error_abort);
+ hotplug_handler_plug(HOTPLUG_HANDLER(lvms->extioi), DEVICE(cs),
+ &error_abort);
}
}
--
2.48.1
next prev parent reply other threads:[~2025-03-21 14:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-21 14:51 [PULL 0/8] Error reporting patches for 2025-03-21 Markus Armbruster
2025-03-21 14:51 ` [PULL 1/8] cryptodev: Fix error handling in cryptodev_lkcf_execute_task() Markus Armbruster
2025-03-21 14:51 ` [PULL 2/8] error: Strip trailing '\n' from an error string argument Markus Armbruster
2025-03-21 14:51 ` [PULL 3/8] hw/xen: Fix xen_bus_realize() error handling Markus Armbruster
2025-03-21 14:51 ` [PULL 4/8] hw/xen: Downgrade a xen_bus_realize() non-error to warning Markus Armbruster
2025-03-21 14:51 ` [PULL 5/8] target/loongarch: Fix error handling of KVM feature checks Markus Armbruster
2025-03-21 14:51 ` [PULL 6/8] hw/loongarch/virt: Eliminate error_propagate() Markus Armbruster
2025-03-21 14:51 ` [PULL 7/8] target/loongarch: Remove unnecessary temporary variable assignment Markus Armbruster
2025-03-21 14:51 ` Markus Armbruster [this message]
2025-03-23 22:29 ` [PULL 0/8] Error reporting patches for 2025-03-21 Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250321145158.3896812-9-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=maobibo@loongson.cn \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).