From patchwork Thu Jul 21 14:44:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 72572 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp483568qga; Thu, 21 Jul 2016 07:50:23 -0700 (PDT) X-Received: by 10.200.48.42 with SMTP id f39mr66003748qte.81.1469112623939; Thu, 21 Jul 2016 07:50:23 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c123si5203535qka.175.2016.07.21.07.50.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Jul 2016 07:50:23 -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]:41284 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQFIt-0000hL-BT for patch@linaro.org; Thu, 21 Jul 2016 10:50:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQFDf-0005ei-PX for qemu-devel@nongnu.org; Thu, 21 Jul 2016 10:45:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQFDd-0007Dy-TB for qemu-devel@nongnu.org; Thu, 21 Jul 2016 10:44:58 -0400 Received: from mail-oi0-x244.google.com ([2607:f8b0:4003:c06::244]:36692) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQFDd-0007Ds-O6 for qemu-devel@nongnu.org; Thu, 21 Jul 2016 10:44:57 -0400 Received: by mail-oi0-x244.google.com with SMTP id d204so7875271oig.3 for ; Thu, 21 Jul 2016 07:44:57 -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=ryjhXH8gUHRDtWU4KW/Kk97A+1yNq4q/KavUr5iYv4g=; b=XCER+zKAElcf7OEl2/Re5aEMEf8dOLJ1JRaSxU9ySTuHIeNhW1TyfBNf395BJYF1UM Z5jZIXI4You+AJ+gM5QKGu2mQdCCVCMNyN8SuJxiaSOEm6d+Bq44b5PzzfkV8U1Yf8mV pKdNgm7T30d+HolrArINPPn/zgUp3o+oxYwvc0r7tnrARNfD0XFQKrSIpzxtzer/fXNX uiAqLIw5OVzXGa9q1W1oOrOw0u/p9JDyc0sRMA7osiMaP2mxs12p6QdmX2/wj6XNMkgQ mwWPMzIUSvkhEFAIRiGAa9jeFvvIKesBvjgq3SiA2C60IiLyFaYKm7SVCDLQFTk+VhgV 8Gvg== 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=ryjhXH8gUHRDtWU4KW/Kk97A+1yNq4q/KavUr5iYv4g=; b=I5pGnhDkekLrmmf7ScLZZh1oUwghPSUYmRofrGeKn8wrM/rPZPoN1aPdRiZCTo7zES dg6XSZq9BLSSmMp84+fcVt+9XbE4rJr+BSMqyM2iIoPmD5O42+uOebiW0wLuvEDn6PNu NJ6y3rFn8eHURW6RLn7X264EJy0k1FZ5AU052BDo+HdQq+OBX2w1evW7YvBpqk2sm7li kITrfzjItK6oGPGMtcGxn2wmCwhxlZS1huePRBzpkft6p3Ry6sgzqYfS2bC4hQxrSyD4 JBa8F1eW10KI0/1bEjYHAIkaC3aUVp4BZHKQaKrk51tqJ3pj623wLabhmXVicLCJ7iHV AVXA== X-Gm-Message-State: ALyK8tLcnSQ708ZRRrGP91wQ2g4VBtc/yTX9N5AA8P7fUlGFKJktmB7iR20o8WGi6mDHYQ== X-Received: by 10.157.51.112 with SMTP id u45mr31942324otd.124.1469112297133; Thu, 21 Jul 2016 07:44:57 -0700 (PDT) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id s20sm3357029ota.25.2016.07.21.07.44.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jul 2016 07:44:56 -0700 (PDT) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 574C4107F; Thu, 21 Jul 2016 09:44:55 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id 3062A302C06; Thu, 21 Jul 2016 09:44:53 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Thu, 21 Jul 2016 09:44:51 -0500 Message-Id: <1469112292-30548-2-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469112292-30548-1-git-send-email-minyard@acm.org> References: <1469112292-30548-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 2/3] 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" 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 Cc: Marc-André Lureau --- hw/watchdog/wdt_i6300esb.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.7.4 diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c index a83d951..49b3cd1 100644 --- a/hw/watchdog/wdt_i6300esb.c +++ b/hw/watchdog/wdt_i6300esb.c @@ -428,6 +428,14 @@ 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); +} + static WatchdogTimerModel model = { .wdt_name = "i6300esb", .wdt_description = "Intel 6300ESB", @@ -441,6 +449,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;