tpm: Move memory subregion function into realize function
Move the memory subregion function into the DeviceClass realize function due to isa_address_space (now) crashing if called in the instance init function. Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
fc079951b7
commit
9dfd24ed84
|
@ -959,18 +959,18 @@ static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
|
||||||
tis->bh = qemu_bh_new(tpm_tis_receive_bh, s);
|
tis->bh = qemu_bh_new(tpm_tis_receive_bh, s);
|
||||||
|
|
||||||
isa_init_irq(&s->busdev, &tis->irq, tis->irq_num);
|
isa_init_irq(&s->busdev, &tis->irq, tis->irq_num);
|
||||||
|
|
||||||
|
memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)),
|
||||||
|
TPM_TIS_ADDR_BASE, &s->mmio);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void tpm_tis_initfn(Object *obj)
|
static void tpm_tis_initfn(Object *obj)
|
||||||
{
|
{
|
||||||
ISADevice *dev = ISA_DEVICE(obj);
|
|
||||||
TPMState *s = TPM(obj);
|
TPMState *s = TPM(obj);
|
||||||
|
|
||||||
memory_region_init_io(&s->mmio, OBJECT(s), &tpm_tis_memory_ops,
|
memory_region_init_io(&s->mmio, OBJECT(s), &tpm_tis_memory_ops,
|
||||||
s, "tpm-tis-mmio",
|
s, "tpm-tis-mmio",
|
||||||
TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
|
TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
|
||||||
memory_region_add_subregion(isa_address_space(dev), TPM_TIS_ADDR_BASE,
|
|
||||||
&s->mmio);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void tpm_tis_class_init(ObjectClass *klass, void *data)
|
static void tpm_tis_class_init(ObjectClass *klass, void *data)
|
||||||
|
|
Loading…
Reference in a new issue