SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/loongarch/virt: Eliminate error_propagate()

Browse Source 
When there is an error, it is put into a local variable and then
propagated to somewhere else. Instead the error can be set right
away, error propagation can be removed.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Message-ID: <20250320032158.1762751-5-maobibo@loongson.cn>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Bibo Mao 2025-03-20 11:21:56 +08:00 committed by Markus Armbruster
parent d7ffc17de7
commit 0973b505fa
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/loongarch/virt.c
View File

@ -859,30 +859,29 @@ static void virt_cpu_pre_plug(HotplugHandler *hotplug_dev,
LoongArchCPU *cpu = LOONGARCH_CPU(dev); LoongArchCPU *cpu = LOONGARCH_CPU(dev);
CPUState *cs = CPU(dev); CPUState *cs = CPU(dev);
CPUArchId *cpu_slot; CPUArchId *cpu_slot;
Error *err = NULL;
LoongArchCPUTopo topo; LoongArchCPUTopo topo;
int arch_id; int arch_id;
if (lvms->acpi_ged) { if (lvms->acpi_ged) {
if ((cpu->thread_id < 0) || (cpu->thread_id >= ms->smp.threads)) { if ((cpu->thread_id < 0) || (cpu->thread_id >= ms->smp.threads)) {
error_setg(&err, error_setg(errp,
"Invalid thread-id %u specified, must be in range 1:%u", "Invalid thread-id %u specified, must be in range 1:%u",
cpu->thread_id, ms->smp.threads - 1); cpu->thread_id, ms->smp.threads - 1);
goto out; return;
} }
if ((cpu->core_id < 0) || (cpu->core_id >= ms->smp.cores)) { if ((cpu->core_id < 0) || (cpu->core_id >= ms->smp.cores)) {
error_setg(&err, error_setg(errp,
"Invalid core-id %u specified, must be in range 1:%u", "Invalid core-id %u specified, must be in range 1:%u",
cpu->core_id, ms->smp.cores - 1); cpu->core_id, ms->smp.cores - 1);
goto out; return;
} }
if ((cpu->socket_id < 0) || (cpu->socket_id >= ms->smp.sockets)) { if ((cpu->socket_id < 0) || (cpu->socket_id >= ms->smp.sockets)) {
error_setg(&err, error_setg(errp,
"Invalid socket-id %u specified, must be in range 1:%u", "Invalid socket-id %u specified, must be in range 1:%u",
cpu->socket_id, ms->smp.sockets - 1); cpu->socket_id, ms->smp.sockets - 1);
goto out; return;
} }
topo.socket_id = cpu->socket_id; topo.socket_id = cpu->socket_id;
@ -891,11 +890,11 @@ static void virt_cpu_pre_plug(HotplugHandler *hotplug_dev,
arch_id = virt_get_arch_id_from_topo(ms, &topo); arch_id = virt_get_arch_id_from_topo(ms, &topo);
cpu_slot = virt_find_cpu_slot(ms, arch_id); cpu_slot = virt_find_cpu_slot(ms, arch_id);
if (CPU(cpu_slot->cpu)) { if (CPU(cpu_slot->cpu)) {
error_setg(&err, error_setg(errp,
"cpu(id%d=%d:%d:%d) with arch-id %" PRIu64 " exists", "cpu(id%d=%d:%d:%d) with arch-id %" PRIu64 " exists",
cs->cpu_index, cpu->socket_id, cpu->core_id, cs->cpu_index, cpu->socket_id, cpu->core_id,
cpu->thread_id, cpu_slot->arch_id); cpu->thread_id, cpu_slot->arch_id);
goto out; return;
} }
} else { } else {
/* For cold-add cpu, find empty cpu slot */ /* For cold-add cpu, find empty cpu slot */
@ -911,33 +910,24 @@ static void virt_cpu_pre_plug(HotplugHandler *hotplug_dev,
cpu->env.address_space_iocsr = &lvms->as_iocsr; cpu->env.address_space_iocsr = &lvms->as_iocsr;
cpu->phy_id = cpu_slot->arch_id; cpu->phy_id = cpu_slot->arch_id;
cs->cpu_index = cpu_slot - ms->possible_cpus->cpus; cs->cpu_index = cpu_slot - ms->possible_cpus->cpus;
numa_cpu_pre_plug(cpu_slot, dev, &err); numa_cpu_pre_plug(cpu_slot, dev, errp);
out:
if (err) {
error_propagate(errp, err);
}
} }
static void virt_cpu_unplug_request(HotplugHandler *hotplug_dev, static void virt_cpu_unplug_request(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp) DeviceState *dev, Error **errp)
{ {
LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(hotplug_dev); LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(hotplug_dev);
Error *err = NULL;
LoongArchCPU *cpu = LOONGARCH_CPU(dev); LoongArchCPU *cpu = LOONGARCH_CPU(dev);
CPUState *cs = CPU(dev); CPUState *cs = CPU(dev);
if (cs->cpu_index == 0) { if (cs->cpu_index == 0) {
error_setg(&err, "hot-unplug of boot cpu(id%d=%d:%d:%d) not supported", error_setg(errp, "hot-unplug of boot cpu(id%d=%d:%d:%d) not supported",
cs->cpu_index, cpu->socket_id, cs->cpu_index, cpu->socket_id,
cpu->core_id, cpu->thread_id); cpu->core_id, cpu->thread_id);
error_propagate(errp, err);
return; return;
} }
hotplug_handler_unplug_request(HOTPLUG_HANDLER(lvms->acpi_ged), dev, &err); hotplug_handler_unplug_request(HOTPLUG_HANDLER(lvms->acpi_ged), dev, errp);
if (err) {
error_propagate(errp, err);
}
} }
static void virt_cpu_unplug(HotplugHandler *hotplug_dev, static void virt_cpu_unplug(HotplugHandler *hotplug_dev,