From patchwork Fri Jul 22 19:50:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 72640 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1173187qga; Fri, 22 Jul 2016 12:52:51 -0700 (PDT) X-Received: by 10.237.44.66 with SMTP id f60mr9247646qtd.11.1469217171970; Fri, 22 Jul 2016 12:52:51 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y63si9671708qtd.134.2016.07.22.12.52.51 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 22 Jul 2016 12:52:51 -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]:49091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQgV9-0006XH-G6 for patch@linaro.org; Fri, 22 Jul 2016 15:52:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQgTA-0005cv-Kh for qemu-devel@nongnu.org; Fri, 22 Jul 2016 15:50:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQgT9-00004z-QI for qemu-devel@nongnu.org; Fri, 22 Jul 2016 15:50:48 -0400 Received: from mail-oi0-x242.google.com ([2607:f8b0:4003:c06::242]:35947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQgT9-00004v-LJ for qemu-devel@nongnu.org; Fri, 22 Jul 2016 15:50:47 -0400 Received: by mail-oi0-x242.google.com with SMTP id d204so11270023oig.3 for ; Fri, 22 Jul 2016 12:50:47 -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=4sLlcDCVccpZIgoRxIWbo7z4C5JJWwipqRmKteRMYR4=; b=D0VQswg8YorJkdwbmUTIIHLg3R8D02eKfoRmuZ797T2EC0+Cx0jIrDuaB/0Aeuhh8+ 56cv3P16kp9mhfnzV4xIrD69A/15e2z5wD7N8mrkH2Cy+gkZBwYBrZI8ARhQkkVOyWua NPvk8egeE8qnzK07NBQGg1+hWiNZR7rd1ZmndDF/5Bsct+biyPKkp9AKsq1AtJd3oxFF nkhH4crFUcP7Yeu1VtyAZ4Sv/ZiDOTjiRZwKzrY3QpRmgF2DNoXdFSBXLdSAoszlSCtQ 2yUtfg6JKF12iTS+uz25IOc56oI9GSlHGGNgdTFnYkN3u+XEscRJbWdJvuH/Z99eIyvZ fQhA== 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=4sLlcDCVccpZIgoRxIWbo7z4C5JJWwipqRmKteRMYR4=; b=EJnX1kExh5p1sQmnf54qHLyZeuuPRZrVfKa+BsxLy3zz/glc/B8B1wjncJkyZPXADO RegHxUAiVqVEzhAfYbuB0+m6WWFnp/I6HmrPU/88RbX1opEfI3+Cu5TiJdG8sVfpdoOG EBBmjVq4xvLBYIeZHo1NWgcg88OwsbvwPXBZVNOqFpEjbgx3r3U6HIEld5hm0aDkySUp 0jhgOZBLB5CNpG/Unt5LINKbaPWsdU72Kvu3Q3OP3HoNqXvkGW73ixN/OF3tgM5SJcvu ZL4Xq6MXdzg6pTneyC8CmWVbxxnbH8D6htH1WA05DfxpoL4MvOlKyLm+pVq1pC+g77yH PBPQ== X-Gm-Message-State: AEkoouvSsPBBA+FU/eSlFwOsa34U2X3cHXQX07kspGR+2EVZ9/5JTsPImTs6NzhZwgKyKA== X-Received: by 10.202.218.215 with SMTP id r206mr2711597oig.55.1469217047206; Fri, 22 Jul 2016 12:50:47 -0700 (PDT) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id g10sm5743212otb.35.2016.07.22.12.50.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jul 2016 12:50:45 -0700 (PDT) Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:c87e:7f7a:2ef0:2f10]) by serve.minyard.net (Postfix) with ESMTPA id 1EF42107C; Fri, 22 Jul 2016 14:50:44 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id 555B3300534; Fri, 22 Jul 2016 14:50:43 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Fri, 22 Jul 2016 14:50:39 -0500 Message-Id: <1469217041-15358-3-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469217041-15358-1-git-send-email-minyard@acm.org> References: <1469217041-15358-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::242 Subject: [Qemu-devel] [PATCH v3 2/4] wdt_i6300esb: 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 exit function to free the timer allocated in the realize function. Signed-off-by: Corey Minyard Cc: Richard W.M. Jones Reviewed-by: Marc-André Lureau Reviewed-by: Richard W.M. Jones --- hw/watchdog/wdt_i6300esb.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.7.4 diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c index a83d951..aa64457 100644 --- a/hw/watchdog/wdt_i6300esb.c +++ b/hw/watchdog/wdt_i6300esb.c @@ -428,6 +428,15 @@ static void i6300esb_realize(PCIDevice *dev, Error **errp) /* qemu_register_coalesced_mmio (addr, 0x10); ? */ } +static void i6300esb_exit(PCIDevice *dev) +{ + I6300State *d = WATCHDOG_I6300ESB_DEVICE(dev); + + timer_del(d->timer); + timer_free(d->timer); + d->timer = NULL; +} + static WatchdogTimerModel model = { .wdt_name = "i6300esb", .wdt_description = "Intel 6300ESB", @@ -441,6 +450,7 @@ static void i6300esb_class_init(ObjectClass *klass, void *data) k->config_read = i6300esb_config_read; k->config_write = i6300esb_config_write; k->realize = i6300esb_realize; + k->exit = i6300esb_exit; k->vendor_id = PCI_VENDOR_ID_INTEL; k->device_id = PCI_DEVICE_ID_INTEL_ESB_9; k->class_id = PCI_CLASS_SYSTEM_OTHER;