From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMu-0000ZY-7B for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:54:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwMs-0007uW-SJ for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:54:04 -0400 Received: from mail-we0-x236.google.com ([2a00:1450:400c:c03::236]:44162) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMs-0007uP-M9 for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:54:02 -0400 Received: by mail-we0-f182.google.com with SMTP id w58so557331wes.13 for ; Tue, 04 Jun 2013 11:54:01 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 20:52:34 +0200 Message-Id: <1370371954-8479-40-git-send-email-pbonzini@redhat.com> In-Reply-To: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> References: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 39/39] tpm: move add/del_subregion to realize/unrealize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com Only do init/destroy in instance_init/finalize. Signed-off-by: Paolo Bonzini --- hw/tpm/tpm_tis.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index d4d8152..303d778 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -881,24 +881,29 @@ 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); + memory_region_add_subregion(isa_address_space(&s->busdev), TPM_TIS_ADDR_BASE, + &s->mmio); +} + +static void tpm_tis_unrealizefn(DeviceState *dev, Error **errp) +{ + TPMState *s = TPM(dev); + + memory_region_del_subregion(get_system_memory(), &s->mmio); } static void tpm_tis_initfn(Object *obj) { - ISADevice *dev = ISA_DEVICE(obj); TPMState *s = TPM(obj); memory_region_init_io(&s->mmio, &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); } static void tpm_tis_uninitfn(Object *obj) { TPMState *s = TPM(obj); - memory_region_del_subregion(get_system_memory(), &s->mmio); memory_region_destroy(&s->mmio); } @@ -907,6 +912,7 @@ static void tpm_tis_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); dc->realize = tpm_tis_realizefn; + dc->unrealize = tpm_tis_unrealizefn; dc->props = tpm_tis_properties; dc->reset = tpm_tis_reset; dc->vmsd = &vmstate_tpm_tis; -- 1.8.1.4