From patchwork Tue Sep 3 12:33:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 272269 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 942FF2C00A3 for ; Wed, 4 Sep 2013 00:08:05 +1000 (EST) Received: from localhost ([::1]:45574 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpyr-00030M-RL for incoming@patchwork.ozlabs.org; Tue, 03 Sep 2013 08:45:13 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=W2ZV1O5Cy+GmYbd0fJtZGgUxL3l9p4I81l3WdaBUtbA=; b=YP2vOoj47eGuDwVDfn2VsgeC/rgRjt5jqR0A2SPIC/Lj4Md+ZWe25gc4FJXYnEn4Q2 liAfbY8zXFMJPfCxf3lIJ+r982Vdhgm8vUr+9EQxH+O2TG/XHX9A24IjDbln1oNDXRNy iDPI8UUJmJ7ao4U4iLNc7ftFNxAtdYBEKrehul3p5K2AP1odtXfcfPdLUhCuO6ZGpDQ8 OtX/xhsZndtRcnC2HdUfERjVN8teP0erS6+wDMyAG3tOhFY5i5U6xONXCNpi/YL7P9Ts XED+iBFuNkMQr9pB6rlj0uTPvto8Q/8I6HhB5ksQHRPz5lN4GwQL+dH9RvxGB93K+4tL HXbw== X-Received: by 10.14.184.3 with SMTP id r3mr4677108eem.49.1378211685852; Tue, 03 Sep 2013 05:34:45 -0700 (PDT) Received: from playground.lan (net-37-117-144-28.cust.dsl.vodafone.it. [37.117.144.28]) by mx.google.com with ESMTPSA id f49sm31150419eec.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 03 Sep 2013 05:34:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 3 Sep 2013 14:33:29 +0200 Message-Id: <1378211609-16121-39-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1378211609-16121-1-git-send-email-pbonzini@redhat.com> References: <1378211609-16121-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::22c Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 38/38] tpm: move add/del_subregion to realize/unrealize 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 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;