mirror of
https://github.com/qemu/qemu.git
synced 2026-04-05 22:00:58 +00:00
hw/sparc64/sun4u_iommu: Fix crash when introspecting sun4u-iommu from the CLI
QEMU currently crashes when introspecting the sun4u-iommu device from the command line interface: $ ./qemu-system-sparc64 -display none -device sun4u-iommu,help qemu-system-sparc64: ../../devel/qemu/system/physmem.c:1401: register_multipage: Assertion `num_pages' failed. Aborted (core dumped) There does not seem to be a compelling reason for initializing the memory regions from the instance_init function, so let's simply move the code into a realize() function instead to fix this issue. Reported-by: Markus Armbruster <armbru@redhat.com> Tested-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com> Message-ID: <20260317085839.445178-1-thuth@redhat.com>
This commit is contained in:
@@ -290,13 +290,14 @@ static void iommu_reset(DeviceState *d)
|
||||
memset(s->regs, 0, IOMMU_NREGS * sizeof(uint64_t));
|
||||
}
|
||||
|
||||
static void iommu_init(Object *obj)
|
||||
static void iommu_realize(DeviceState *ds, Error **errp)
|
||||
{
|
||||
IOMMUState *s = SUN4U_IOMMU(obj);
|
||||
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
|
||||
IOMMUState *s = SUN4U_IOMMU(ds);
|
||||
SysBusDevice *sbd = SYS_BUS_DEVICE(ds);
|
||||
Object *obj = OBJECT(ds);
|
||||
|
||||
memory_region_init_iommu(&s->iommu, sizeof(s->iommu),
|
||||
TYPE_SUN4U_IOMMU_MEMORY_REGION, OBJECT(s),
|
||||
TYPE_SUN4U_IOMMU_MEMORY_REGION, obj,
|
||||
"iommu-sun4u", UINT64_MAX);
|
||||
address_space_init(&s->iommu_as, MEMORY_REGION(&s->iommu), "iommu-as");
|
||||
|
||||
@@ -310,13 +311,13 @@ static void iommu_class_init(ObjectClass *klass, const void *data)
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
|
||||
device_class_set_legacy_reset(dc, iommu_reset);
|
||||
dc->realize = iommu_realize;
|
||||
}
|
||||
|
||||
static const TypeInfo iommu_info = {
|
||||
.name = TYPE_SUN4U_IOMMU,
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(IOMMUState),
|
||||
.instance_init = iommu_init,
|
||||
.class_init = iommu_class_init,
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user