From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YV7Sq-00026Y-TH for qemu-devel@nongnu.org; Mon, 09 Mar 2015 19:52:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YV7Sc-0004SC-Mw for qemu-devel@nongnu.org; Mon, 09 Mar 2015 19:52:00 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:36005) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YV7Sc-0004Rq-FD for qemu-devel@nongnu.org; Mon, 09 Mar 2015 19:51:46 -0400 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 9 Mar 2015 17:51:44 -0600 From: Stefan Berger Date: Mon, 9 Mar 2015 19:51:39 -0400 Message-Id: <1425945099-215293-1-git-send-email-stefanb@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] tpm: Move memory initialization into realize function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com, qemu-trivial@nongnu.org, qemu-devel@nongnu.org Cc: Stefan Berger , Stefan Berger 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); } 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, }; -- 2.1.0