motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-22 01:21:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/intc/loongarch_extioi: Get cpu number from possible_cpu_arch_ids

Browse source 
Supported CPU number can be acquired from function
possible_cpu_arch_ids(), cpu-num property is not necessary.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
This commit is contained in:
Bibo Mao 2025-01-06 15:36:25 +08:00
parent 38adceb4c3
commit 5a3e068d41
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/intc/loongarch_extioi.c
View file

@ -347,12 +347,6 @@ static void loongarch_extioi_realize(DeviceState *dev, Error **errp)
s->status |= BIT(EXTIOI_ENABLE); s->status |= BIT(EXTIOI_ENABLE);
} }
s->cpu = g_new0(ExtIOICore, s->num_cpu);
if (s->cpu == NULL) {
error_setg(errp, "Memory allocation for ExtIOICore faile");
return;
}
for (i = 0; i < s->num_cpu; i++) { for (i = 0; i < s->num_cpu; i++) {
for (pin = 0; pin < LS3A_INTC_IP; pin++) { for (pin = 0; pin < LS3A_INTC_IP; pin++) {
qdev_init_gpio_out(dev, &s->cpu[i].parent_irq[pin], 1); qdev_init_gpio_out(dev, &s->cpu[i].parent_irq[pin], 1);

17
hw/intc/loongarch_extioi_common.c
View file

@ -13,11 +13,24 @@
static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp) static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
{ {
LoongArchExtIOICommonState *s = (LoongArchExtIOICommonState *)dev; LoongArchExtIOICommonState *s = (LoongArchExtIOICommonState *)dev;
MachineState *machine = MACHINE(qdev_get_machine());
MachineClass *mc = MACHINE_GET_CLASS(machine);
const CPUArchIdList *id_list;
int i;
if (s->num_cpu == 0) { assert(mc->possible_cpu_arch_ids);
error_setg(errp, "num-cpu must be at least 1"); id_list = mc->possible_cpu_arch_ids(machine);
s->num_cpu = id_list->len;
s->cpu = g_new0(ExtIOICore, s->num_cpu);
if (s->cpu == NULL) {
error_setg(errp, "Memory allocation for ExtIOICore faile");
return; return;
} }
for (i = 0; i < s->num_cpu; i++) {
s->cpu[i].arch_id = id_list->cpus[i].arch_id;
s->cpu[i].cpu = CPU(id_list->cpus[i].cpu);
}
} }
static int loongarch_extioi_common_pre_save(void *opaque) static int loongarch_extioi_common_pre_save(void *opaque)

2
include/hw/intc/loongarch_extioi_common.h
View file

@ -65,6 +65,8 @@ typedef struct ExtIOICore {
uint32_t coreisr[EXTIOI_IRQS_GROUP_COUNT]; uint32_t coreisr[EXTIOI_IRQS_GROUP_COUNT];
DECLARE_BITMAP(sw_isr[LS3A_INTC_IP], EXTIOI_IRQS); DECLARE_BITMAP(sw_isr[LS3A_INTC_IP], EXTIOI_IRQS);
qemu_irq parent_irq[LS3A_INTC_IP]; qemu_irq parent_irq[LS3A_INTC_IP];
uint64_t arch_id;
CPUState *cpu;
} ExtIOICore; } ExtIOICore;
struct LoongArchExtIOICommonState { struct LoongArchExtIOICommonState {