From patchwork Wed Dec 14 19:06:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 9474529 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 42B5360571 for ; Wed, 14 Dec 2016 19:08:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C6D2286F1 for ; Wed, 14 Dec 2016 19:08:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EA7D28734; Wed, 14 Dec 2016 19:08:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 18AE5286F1 for ; Wed, 14 Dec 2016 19:08:44 +0000 (UTC) Received: from localhost ([::1]:49688 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cHEux-0006Xe-Nv for patchwork-qemu-devel@patchwork.kernel.org; Wed, 14 Dec 2016 14:08:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cHEue-0006JG-5K for qemu-devel@nongnu.org; Wed, 14 Dec 2016 14:08:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cHEua-0001bR-V0 for qemu-devel@nongnu.org; Wed, 14 Dec 2016 14:08:24 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35315) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cHEua-0001Zq-LC for qemu-devel@nongnu.org; Wed, 14 Dec 2016 14:08:20 -0500 Received: by mail-wm0-f67.google.com with SMTP id a20so1150262wme.2 for ; Wed, 14 Dec 2016 11:07:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=pP+B+qvasbjtbsXgBnF7fC761ee5OwSKHDp8E0xm7ZE=; b=BbiBg0xqLpCB3J6YHqRk19ZUap32B7hYVRxHv/PJKPZYMojH7tFaGKg9TnG6b9LkbY EuJnEnOo0KpHc3lsHcG0Wp37lreTOocBNGJYIdhxJzpjjuHUejwtcED2NQhOPbGTzoHg A4eQxB9uda5RNiHM9jaFbiclt7AASRCalzzPz9U5JTeDkr96iYYitmROUJSZqmLkTLAn LRy1776KITRfoAkalfb4IStWMZWQyDkEyaEAXdXnZZzIxeGar8/oLxqT+O3Q8x4kfHPn EpjjiZPzi57YmLRIrthYTQfxLjLUucIPvwVS9IsHhW9YgT8wYmYQAag0TNIS09sj/yi6 Ir8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=pP+B+qvasbjtbsXgBnF7fC761ee5OwSKHDp8E0xm7ZE=; b=dNAvgZJA6y6Bk7ifUsod7+W5xwUI3Me3DMnooIuCesi8aA6X9yEM8Ccvh9gZ6jMdAE pQphv+xDmOwpCmHKaJbxPSIBL0Sxq7fLPoukGzUpMjdK50ueuOCWPwFBsjhZorn9QKMh SupApbxMiQ2rjB6ZcAiJRvE/R998jgY4L9mhASlM5POekUwTM1NAzZ/E0WCMiNONdvau GbK4EmgzlI+JLARgkNHaeVz7e80PPIxrulYOylrEylEbly6jaHOY4B6GQ4cJqtJKi/go 8YNulgBQ3kQvq+F/NkdaPWtzGpusLdmS/EZgl6xCJlemqiKxALuDmof5dgYn3Kp0qfOS gAOw== X-Gm-Message-State: AKaTC03MeFvY/QCzHyobmtSfXGSOSpNK8MaT/SnpiQfzSaU3hPFl/GFKJCQHxLEUuPdeSfm/5eUjYM4SafAx7g== X-Received: by 10.25.242.75 with SMTP id d11mr4991540lfk.168.1481742416848; Wed, 14 Dec 2016 11:06:56 -0800 (PST) MIME-Version: 1.0 References: <5850b689.68219d0a.9be2d.9b07@mx.google.com> In-Reply-To: <5850b689.68219d0a.9be2d.9b07@mx.google.com> From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Wed, 14 Dec 2016 19:06:45 +0000 Message-ID: To: Li Qiang , kraxel@redhat.com, qemu-devel@nongnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.67 X-Content-Filtered-By: Mailman/MimeDel 2.1.21 Subject: Re: [Qemu-devel] [PATCH v2] audio: ac97: add exit function 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: Li Qiang Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi On Wed, Dec 14, 2016 at 6:03 AM Li Qiang wrote: From: Li Qiang Currently the ac97 device emulation doesn't have a exit function, hot unplug this device will leak some memory. Add a exit function to avoid this. Signed-off-by: Li Qiang --- Changes since the v1: close the streams hw/audio/ac97.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) style (no space), even if the file uses its own style. + AUD_remove_card (&s->card); +} + static int ac97_init (PCIBus *bus) { pci_create_simple (bus, -1, "AC97"); @@ -1404,6 +1421,7 @@ static void ac97_class_init (ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS (klass); k->realize = ac97_realize; + k->exit = ac97_exit; k->vendor_id = PCI_VENDOR_ID_INTEL; k->device_id = PCI_DEVICE_ID_INTEL_82801AA_5; k->revision = 0x01; -- 1.8.3.1 diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index cbd959e..efa20b5 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -1387,6 +1387,23 @@ static void ac97_realize(PCIDevice *dev, Error **errp) ac97_on_reset (&s->dev.qdev); } +static void ac97_exit(PCIDevice *dev) +{ + AC97LinkState *s = DO_UPCAST(AC97LinkState, dev, dev); + + if (s->voice_pi) { + AUD_close_in (&s->card, s->voice_pi); + } + if (s->voice_po) { + AUD_close_out (&s->card, s->voice_po); + } + if (s->voice_mc) { + AUD_close_in (&s->card, s->voice_mc); + } + You don't need to check if the pointer is non-null, same for es1370 Regarding style (space before parentheses), I think it's best to use qemu