[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 39/39] tpm: move add/del_subregion to realize/unreal
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 39/39] tpm: move add/del_subregion to realize/unrealize |
Date: |
Tue, 4 Jun 2013 20:52:34 +0200 |
Only do init/destroy in instance_init/finalize.
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PATCH 29/39] xio3130-downstream: split exit and instance_finalize, (continued)
- [Qemu-devel] [PATCH 29/39] xio3130-downstream: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 30/39] xio3130-upstream: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 31/39] pcie: do not recreate mmcfg I/O region, use an alias instead, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 32/39] esp: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 33/39] lsi: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 34/39] pvscsi: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 35/39] usb-uhci: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 36/39] virtio-pci: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 37/39] wdt_i6300esb: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 38/39] xen_pt: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 39/39] tpm: move add/del_subregion to realize/unrealize,
Paolo Bonzini <=
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Andreas Färber, 2013/06/05
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Michael S. Tsirkin, 2013/06/05
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Andreas Färber, 2013/06/05
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Michael S. Tsirkin, 2013/06/05
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Andreas Färber, 2013/06/05
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Michael S. Tsirkin, 2013/06/05
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Andreas Färber, 2013/06/05
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Peter Maydell, 2013/06/05
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Michael S. Tsirkin, 2013/06/05