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

hw/intc/loongarch_pch: Rename LoongArchPCHPIC with LoongArchPICCommonState

Browse source 
With pic vmstate, rename structure name vmstate_loongarch_pch_pic with
vmstate_loongarch_pic_common, and with pic property rename
loongarch_pch_pic_properties with loongarch_pic_common_properties.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
This commit is contained in:
Bibo Mao 2024-12-18 17:10:14 +08:00
parent f42e888837
commit c43aceddb2
1 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

52
hw/intc/loongarch_pch_pic.c
View file

@ -379,13 +379,25 @@ static void loongarch_pch_pic_reset(DeviceState *d)
s->int_polarity = 0x0; s->int_polarity = 0x0;
} }
static void loongarch_pic_common_realize(DeviceState *dev, Error **errp)
{
LoongArchPICCommonState *s = LOONGARCH_PCH_PIC(dev);
if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) {
error_setg(errp, "Invalid 'pic_irq_num'");
return;
}
}
static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp) static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp)
{ {
LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(dev); LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
Error *local_err = NULL;
if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) { loongarch_pic_common_realize(dev, &local_err);
error_setg(errp, "Invalid 'pic_irq_num'"); if (local_err) {
error_propagate(errp, local_err);
return; return;
} }
@ -405,28 +417,28 @@ static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp)
} }
static const Property loongarch_pch_pic_properties[] = { static const Property loongarch_pic_common_properties[] = {
DEFINE_PROP_UINT32("pch_pic_irq_num", LoongArchPCHPIC, irq_num, 0), DEFINE_PROP_UINT32("pch_pic_irq_num", LoongArchPICCommonState, irq_num, 0),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };
static const VMStateDescription vmstate_loongarch_pch_pic = { static const VMStateDescription vmstate_loongarch_pic_common = {
.name = TYPE_LOONGARCH_PCH_PIC, .name = "loongarch_pch_pic",
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.fields = (const VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT64(int_mask, LoongArchPCHPIC), VMSTATE_UINT64(int_mask, LoongArchPICCommonState),
VMSTATE_UINT64(htmsi_en, LoongArchPCHPIC), VMSTATE_UINT64(htmsi_en, LoongArchPICCommonState),
VMSTATE_UINT64(intedge, LoongArchPCHPIC), VMSTATE_UINT64(intedge, LoongArchPICCommonState),
VMSTATE_UINT64(intclr, LoongArchPCHPIC), VMSTATE_UINT64(intclr, LoongArchPICCommonState),
VMSTATE_UINT64(auto_crtl0, LoongArchPCHPIC), VMSTATE_UINT64(auto_crtl0, LoongArchPICCommonState),
VMSTATE_UINT64(auto_crtl1, LoongArchPCHPIC), VMSTATE_UINT64(auto_crtl1, LoongArchPICCommonState),
VMSTATE_UINT8_ARRAY(route_entry, LoongArchPCHPIC, 64), VMSTATE_UINT8_ARRAY(route_entry, LoongArchPICCommonState, 64),
VMSTATE_UINT8_ARRAY(htmsi_vector, LoongArchPCHPIC, 64), VMSTATE_UINT8_ARRAY(htmsi_vector, LoongArchPICCommonState, 64),
VMSTATE_UINT64(last_intirr, LoongArchPCHPIC), VMSTATE_UINT64(last_intirr, LoongArchPICCommonState),
VMSTATE_UINT64(intirr, LoongArchPCHPIC), VMSTATE_UINT64(intirr, LoongArchPICCommonState),
VMSTATE_UINT64(intisr, LoongArchPCHPIC), VMSTATE_UINT64(intisr, LoongArchPICCommonState),
VMSTATE_UINT64(int_polarity, LoongArchPCHPIC), VMSTATE_UINT64(int_polarity, LoongArchPICCommonState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };
@ -437,8 +449,8 @@ static void loongarch_pch_pic_class_init(ObjectClass *klass, void *data)
dc->realize = loongarch_pch_pic_realize; dc->realize = loongarch_pch_pic_realize;
device_class_set_legacy_reset(dc, loongarch_pch_pic_reset); device_class_set_legacy_reset(dc, loongarch_pch_pic_reset);
dc->vmsd = &vmstate_loongarch_pch_pic; dc->vmsd = &vmstate_loongarch_pic_common;
device_class_set_props(dc, loongarch_pch_pic_properties); device_class_set_props(dc, loongarch_pic_common_properties);
} }
static const TypeInfo loongarch_pch_pic_info = { static const TypeInfo loongarch_pch_pic_info = {