From patchwork Thu Jul 21 16:49:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 72583 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp572604qga; Thu, 21 Jul 2016 10:49:12 -0700 (PDT) X-Received: by 10.200.57.34 with SMTP id s31mr84035202qtb.49.1469123352270; Thu, 21 Jul 2016 10:49:12 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h19si5717671qth.130.2016.07.21.10.49.12 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Jul 2016 10:49:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:42472 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQI5v-0005ti-Ou for patch@linaro.org; Thu, 21 Jul 2016 13:49:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQH9z-0004YK-HR for qemu-devel@nongnu.org; Thu, 21 Jul 2016 12:49:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQH9v-0004i1-PN for qemu-devel@nongnu.org; Thu, 21 Jul 2016 12:49:19 -0400 Received: from mail-oi0-x244.google.com ([2607:f8b0:4003:c06::244]:34753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQH9v-0004hw-KT for qemu-devel@nongnu.org; Thu, 21 Jul 2016 12:49:15 -0400 Received: by mail-oi0-x244.google.com with SMTP id c199so8213915oig.1 for ; Thu, 21 Jul 2016 09:49:15 -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 :mime-version:content-transfer-encoding; bh=PHP5tOeuFY7PpCyEzfCAqMcCxwFEvkMWpG+j4z3iL40=; b=ZQipV18GrAxgRDIRPHa8XQp3xoFJo5NUhKNpfofZAwwu4g5QY+owpZnQP6iXzlPuu/ ppJhLh7Xx5tWvFQ/LZkZo6d3QmSjxekRbk5uBcqnSa+r0uDwudmWJXKs66uCaUmYJoI6 Fb6BUg2xuR+8jt732YbYf2p5Mblv9bqsywK5AHuf9UKKR4nvz2v+8ZSYQJh0qUQ1P0uR L2fEA3iIFyKSG8o3INi9qQbYAlQYn9mLhKFFveWobwlbCfL85YcMGBw0DeC2L0AUJQDH 8Jc52z5ASIjc/KhN86FqFgk/Q45uNkMDtjXNhmegF4p91YITSfABCihAD0iGqtFIbzcu MTbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PHP5tOeuFY7PpCyEzfCAqMcCxwFEvkMWpG+j4z3iL40=; b=Qb6XEFvPllvq8G0nt6dYzwYuhpOYnIrxL54eyDzWwUA1bwYqOna8aAK5E1AzDotaiB giWLBOQ6TG6IEts99rM7kI4kAZiRfi5UGfw36a/Ywk+zMSCxSxy77hkqFy8EoAeM6snI A2iZQol/PwS0xKh85xr6m0yqyY7+PVWaf1mudMz8EosZ+pAHdFXVzXATVwN5PhdA/LtC dTTKt4Lkik1N88xjEt8vWye4QvTwlVzfzEC5wYZc6iO5Ut/95iiMBBcXupjgNXsCMJ+u XOvAx+gvjs+QGa78DD1rrTjJAv84+bMalCF+y6NQ/bn40OYJXLb5XBaCYi6YKYgtFA/y zAfw== X-Gm-Message-State: ALyK8tKoIdrcrfOvw98n34shenTOZYRmVukY4V35G9msp5ArPJ4/1h7m0mygpBeelqGAmg== X-Received: by 10.157.17.227 with SMTP id y32mr31310936oty.101.1469119755115; Thu, 21 Jul 2016 09:49:15 -0700 (PDT) Received: from serve.minyard.net ([173.64.235.97]) by smtp.gmail.com with ESMTPSA id j2sm3507813oih.19.2016.07.21.09.49.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jul 2016 09:49:13 -0700 (PDT) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id DBFEE1425; Thu, 21 Jul 2016 11:49:12 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id B234D300537; Thu, 21 Jul 2016 11:49:11 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Thu, 21 Jul 2016 11:49:09 -0500 Message-Id: <1469119749-31181-4-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469119749-31181-1-git-send-email-minyard@acm.org> References: <1469119749-31181-1-git-send-email-minyard@acm.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4003:c06::244 Subject: [Qemu-devel] [PATCH v2 3/3] wdt_ib700: Free timer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Richard W . M . Jones" , minyard@acm.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard Add an unrealize function to free the timer allocated in the realize function and to delete the port memory added there, too. Signed-off-by: Corey Minyard Cc: Richard W.M. Jones Cc: Marc-André Lureau Reviewed-by: Richard W.M. Jones --- hw/watchdog/wdt_ib700.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.7.4 diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c index 532afe8..23d4857 100644 --- a/hw/watchdog/wdt_ib700.c +++ b/hw/watchdog/wdt_ib700.c @@ -117,6 +117,15 @@ static void wdt_ib700_realize(DeviceState *dev, Error **errp) portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj), 0); } +static void wdt_ib700_unrealize(DeviceState *dev, Error **errp) +{ + IB700State *s = IB700(dev); + + timer_del(s->timer); + timer_free(s->timer); + portio_list_del(&s->port_list); +} + static void wdt_ib700_reset(DeviceState *dev) { IB700State *s = IB700(dev); @@ -136,6 +145,7 @@ static void wdt_ib700_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); dc->realize = wdt_ib700_realize; + dc->unrealize = wdt_ib700_unrealize; dc->reset = wdt_ib700_reset; dc->vmsd = &vmstate_ib700; set_bit(DEVICE_CATEGORY_MISC, dc->categories);