diff mbox

tpm: Move memory initialization into realize function

Message ID 1425945099-215293-1-git-send-email-stefanb@linux.vnet.ibm.com
State New
Headers show

Commit Message

Stefan Berger March 9, 2015, 11:51 p.m. UTC 
From: Stefan Berger <stefanb@us.ibm.com>

Move the memory initialization into the DeviceClass realize function due to
isa_address_space crashing if called in the instance init function.
A recent change must have changed the order in which structures are
initialized so that this move is now necessary.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 hw/tpm/tpm_tis.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

Comments

Paolo Bonzini March 10, 2015, 9:35 a.m. UTC | #1 
On 10/03/2015 00:51, Stefan Berger wrote:
> From: Stefan Berger <stefanb@us.ibm.com>
> 
> Move the memory initialization into the DeviceClass realize function due to
> isa_address_space crashing if called in the instance init function.
> A recent change must have changed the order in which structures are
> initialized so that this move is now necessary.
> 
> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
> ---
>  hw/tpm/tpm_tis.c | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
> index d0bb97f..339e1bf 100644
> --- a/hw/tpm/tpm_tis.c
> +++ b/hw/tpm/tpm_tis.c
> @@ -959,18 +959,12 @@ static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
>      tis->bh = qemu_bh_new(tpm_tis_receive_bh, s);
>  
>      isa_init_irq(&s->busdev, &tis->irq, tis->irq_num);
> -}
> -
> -static void tpm_tis_initfn(Object *obj)
> -{
> -    ISADevice *dev = ISA_DEVICE(obj);
> -    TPMState *s = TPM(obj);
>  
>      memory_region_init_io(&s->mmio, OBJECT(s), &tpm_tis_memory_ops,
>                            s, "tpm-tis-mmio",
>                            TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
> -    memory_region_add_subregion(isa_address_space(dev), TPM_TIS_ADDR_BASE,
> -                                &s->mmio);
> +    memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)),
> +                                TPM_TIS_ADDR_BASE, &s->mmio);
>  }

Please leave memory_region_init_io in the instance_init function, though.

Thanks,

Paolo

>  static void tpm_tis_class_init(ObjectClass *klass, void *data)
> @@ -987,7 +981,6 @@ static const TypeInfo tpm_tis_info = {
>      .name = TYPE_TPM_TIS,
>      .parent = TYPE_ISA_DEVICE,
>      .instance_size = sizeof(TPMState),
> -    .instance_init = tpm_tis_initfn,
>      .class_init  = tpm_tis_class_init,
>  };
>  
>
diff mbox

Patch

diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index d0bb97f..339e1bf 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -959,18 +959,12 @@  static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
     tis->bh = qemu_bh_new(tpm_tis_receive_bh, s);
 
     isa_init_irq(&s->busdev, &tis->irq, tis->irq_num);
-}
-
-static void tpm_tis_initfn(Object *obj)
-{
-    ISADevice *dev = ISA_DEVICE(obj);
-    TPMState *s = TPM(obj);
 
     memory_region_init_io(&s->mmio, OBJECT(s), &tpm_tis_memory_ops,
                           s, "tpm-tis-mmio",
                           TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
-    memory_region_add_subregion(isa_address_space(dev), TPM_TIS_ADDR_BASE,
-                                &s->mmio);
+    memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)),
+                                TPM_TIS_ADDR_BASE, &s->mmio);
 }
 
 static void tpm_tis_class_init(ObjectClass *klass, void *data)
@@ -987,7 +981,6 @@  static const TypeInfo tpm_tis_info = {
     .name = TYPE_TPM_TIS,
     .parent = TYPE_ISA_DEVICE,
     .instance_size = sizeof(TPMState),
-    .instance_init = tpm_tis_initfn,
     .class_init  = tpm_tis_class_init,
 };