From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVGZm-0006Ug-9d for qemu-devel@nongnu.org; Tue, 10 Mar 2015 05:35:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVGZg-0003e5-OR for qemu-devel@nongnu.org; Tue, 10 Mar 2015 05:35:46 -0400 Sender: Paolo Bonzini Message-ID: <54FEBAE7.6030905@redhat.com> Date: Tue, 10 Mar 2015 10:35:35 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1425945099-215293-1-git-send-email-stefanb@linux.vnet.ibm.com> In-Reply-To: <1425945099-215293-1-git-send-email-stefanb@linux.vnet.ibm.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] tpm: Move memory initialization into realize function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Berger , mst@redhat.com, qemu-trivial@nongnu.org, qemu-devel@nongnu.org Cc: Stefan Berger On 10/03/2015 00:51, Stefan Berger wrote: > From: Stefan Berger > > 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 > --- > 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, > }; > >