Skip to content

Commit fa0dde1

Browse files
bibo-maogaosong-loongson
authored andcommitted
hw/loongarch/virt: Replace destination error with error_abort
In function virt_cpu_plug() and virt_cpu_unplug(), the error is impossile. Destination error is not propagated and replaced with error_abort. With this, the logic is simple. Signed-off-by: Bibo Mao <[email protected]> Acked-by: Markus Armbruster <[email protected]> Message-Id: <[email protected]> Signed-off-by: Song Gao <[email protected]>
1 parent 988ad4c commit fa0dde1

File tree

1 file changed

+7
-32
lines changed

1 file changed

+7
-32
lines changed

hw/loongarch/virt.c

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -936,29 +936,15 @@ static void virt_cpu_unplug(HotplugHandler *hotplug_dev,
936936
DeviceState *dev, Error **errp)
937937
{
938938
CPUArchId *cpu_slot;
939-
Error *err = NULL;
940939
LoongArchCPU *cpu = LOONGARCH_CPU(dev);
941940
LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(hotplug_dev);
942941

943942
/* Notify ipi and extioi irqchip to remove interrupt routing to CPU */
944-
hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->ipi), dev, &err);
945-
if (err) {
946-
error_propagate(errp, err);
947-
return;
948-
}
949-
950-
hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->extioi), dev, &err);
951-
if (err) {
952-
error_propagate(errp, err);
953-
return;
954-
}
943+
hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->ipi), dev, &error_abort);
944+
hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->extioi), dev, &error_abort);
955945

956946
/* Notify acpi ged CPU removed */
957-
hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->acpi_ged), dev, &err);
958-
if (err) {
959-
error_propagate(errp, err);
960-
return;
961-
}
947+
hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->acpi_ged), dev, &error_abort);
962948

963949
cpu_slot = virt_find_cpu_slot(MACHINE(lvms), cpu->phy_id);
964950
cpu_slot->cpu = NULL;
@@ -971,29 +957,18 @@ static void virt_cpu_plug(HotplugHandler *hotplug_dev,
971957
CPUArchId *cpu_slot;
972958
LoongArchCPU *cpu = LOONGARCH_CPU(dev);
973959
LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(hotplug_dev);
974-
Error *err = NULL;
975960

976961
if (lvms->ipi) {
977-
hotplug_handler_plug(HOTPLUG_HANDLER(lvms->ipi), dev, &err);
978-
if (err) {
979-
error_propagate(errp, err);
980-
return;
981-
}
962+
hotplug_handler_plug(HOTPLUG_HANDLER(lvms->ipi), dev, &error_abort);
982963
}
983964

984965
if (lvms->extioi) {
985-
hotplug_handler_plug(HOTPLUG_HANDLER(lvms->extioi), dev, &err);
986-
if (err) {
987-
error_propagate(errp, err);
988-
return;
989-
}
966+
hotplug_handler_plug(HOTPLUG_HANDLER(lvms->extioi), dev, &error_abort);
990967
}
991968

992969
if (lvms->acpi_ged) {
993-
hotplug_handler_plug(HOTPLUG_HANDLER(lvms->acpi_ged), dev, &err);
994-
if (err) {
995-
error_propagate(errp, err);
996-
}
970+
hotplug_handler_plug(HOTPLUG_HANDLER(lvms->acpi_ged), dev,
971+
&error_abort);
997972
}
998973

999974
cpu_slot = virt_find_cpu_slot(MACHINE(lvms), cpu->phy_id);

0 commit comments

Comments
 (0)