From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpot-0007zx-HO for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:35:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGpok-0006cU-Uh for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:55 -0400 Received: from mail-ee0-x22c.google.com ([2a00:1450:4013:c00::22c]:56158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpok-0006cO-NY for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:46 -0400 Received: by mail-ee0-f44.google.com with SMTP id b47so2963017eek.17 for ; Tue, 03 Sep 2013 05:34:45 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Sep 2013 14:33:29 +0200 Message-Id: <1378211609-16121-39-git-send-email-pbonzini@redhat.com> In-Reply-To: <1378211609-16121-1-git-send-email-pbonzini@redhat.com> References: <1378211609-16121-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 38/38] 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 They are currently in instance_initialize and instance_finalize. Signed-off-by: Paolo Bonzini --- hw/tpm/tpm_tis.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index 6f0a4d2..7cb2a3a 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -855,6 +855,7 @@ static Property tpm_tis_properties[] = { static void tpm_tis_realizefn(DeviceState *dev, Error **errp) { + ISADevice *d = ISA_DEVICE(dev); TPMState *s = TPM(dev); TPMTISEmuState *tis = &s->s.tis; @@ -881,26 +882,31 @@ 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); + isa_init_irq(d, &tis->irq, tis->irq_num); + memory_region_add_subregion(isa_address_space(d), 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, 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); } 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); } @@ -909,6 +915,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.3.1