From patchwork Mon Mar 9 23:51:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 448293 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3FB421401AF for ; Tue, 10 Mar 2015 10:52:25 +1100 (AEDT) Received: from localhost ([::1]:45813 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YV7TB-0002Oj-RT for incoming@patchwork.ozlabs.org; Mon, 09 Mar 2015 19:52:21 -0400 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 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e33.co.us.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 9 Mar 2015 17:51:43 -0600 Received: from b03cxnp08025.gho.boulder.ibm.com (b03cxnp08025.gho.boulder.ibm.com [9.17.130.17]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id A22503E4003B; Mon, 9 Mar 2015 17:51:42 -0600 (MDT) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t29NpaUi31654122; Mon, 9 Mar 2015 16:51:36 -0700 Received: from d03av05.boulder.ibm.com (localhost [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t29Npgm6018643; Mon, 9 Mar 2015 17:51:42 -0600 Received: from localhost.localdomain (dhcp-9-2-140-32.watson.ibm.com [9.2.140.32]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t29NpfsR018635; Mon, 9 Mar 2015 17:51:41 -0600 From: Stefan Berger To: mst@redhat.com, qemu-trivial@nongnu.org, qemu-devel@nongnu.org Date: Mon, 9 Mar 2015 19:51:39 -0400 Message-Id: <1425945099-215293-1-git-send-email-stefanb@linux.vnet.ibm.com> X-Mailer: git-send-email 1.9.3 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15030923-0009-0000-0000-0000095C8711 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 32.97.110.151 Cc: Stefan Berger , Stefan Berger Subject: [Qemu-devel] [PATCH] tpm: Move memory initialization into realize function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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, };