From patchwork Thu Jul 21 16:49:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 72581 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp563610qga; Thu, 21 Jul 2016 10:29:27 -0700 (PDT) X-Received: by 10.55.215.141 with SMTP id t13mr71749071qkt.31.1469122167100; Thu, 21 Jul 2016 10:29:27 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d189si5645111qkf.300.2016.07.21.10.29.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Jul 2016 10:29:27 -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]:42307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQHmo-0005nZ-Ig for patch@linaro.org; Thu, 21 Jul 2016 13:29:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50769) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQH9x-0004Ws-TZ 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 1bQH9w-0004iE-4t for qemu-devel@nongnu.org; Thu, 21 Jul 2016 12:49:17 -0400 Received: from mail-oi0-x242.google.com ([2607:f8b0:4003:c06::242]:35601) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQH9w-0004i7-0Q for qemu-devel@nongnu.org; Thu, 21 Jul 2016 12:49:16 -0400 Received: by mail-oi0-x242.google.com with SMTP id w143so8200169oiw.2 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=4E6kPp+ipPMmqrW6t4XAZ/gbs3rMUTKLjugmx6OSbK8=; b=Qp5pS1t1yZkEOQIGv8+jd2a6tO1eqtF29Zy3KEAUZARAoO4s/lvV18nXOer9HOGlVD W2SWovXQspCu2s5OPcYAsrNh0hXYZjXjMwrjM837mo/3MWW9iaJWu6NcO4R6PKWMJRBf IMUdQntYulgtWRU+5xUpPK0/W2BNOltJwYyJjc3PED63viR5oN803DjjzmXfjT2NjxOy TT+p6HsGNmVezerWa3P3uOyO5pKpCO5UP+9SKfOsuqWwHiUo9O4bNUizYRHLdoSdoKu+ 7wq53oCW8f6gTcP9EdhHpEGOLuDX/WK3/t3ivvP9vCARoHrLUltB4XA2Wz5/BH4wmy3W LMbg== 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=4E6kPp+ipPMmqrW6t4XAZ/gbs3rMUTKLjugmx6OSbK8=; b=CaHuk+8uUP2d5Zv69KuI5cqxtLO47Y6Jo4Em87olMo7TNWk1SP3jvWwf8dQK/JlQkd 9pS/DCFOwItscD05xqnsbOgLGWeheZQQZDvvPJHmXypAGxvOniaWp+kzWLNhSWj6G8TM ClrTvuds8v4Rsv3Yd/Q+uRFzEZ2XAZigIFrJQPuTrz9Jk1o64medHSzxp7YigDJRxwxY PgycjUjqmn9AUSFZ1lgMMPmSgmiHXM4k8wzICwIE3ZqK02EYEU8TTb5A3V5+GUfhYDeq h00VTXdXkCo8ukFHl8sw7dFC5kahWCyt5abvkKtbg1qic1Swf9pVs6DAav5Vh5PDx9lw GYcQ== X-Gm-Message-State: ALyK8tL11wTAl3Ksgmt8xHWurLto8D7+wyqTDhDUNJ3C3b06RidFqWCzLZDwt5e7EZ9Asw== X-Received: by 10.202.94.139 with SMTP id s133mr2436589oib.82.1469119755474; Thu, 21 Jul 2016 09:49:15 -0700 (PDT) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id a35sm3536659ota.41.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 CF2E9107F; Thu, 21 Jul 2016 11:49:12 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id 9FFAD302C06; 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:08 -0500 Message-Id: <1469119749-31181-3-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::242 Subject: [Qemu-devel] [PATCH v2 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" , 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 | 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;