From patchwork Tue Dec 13 17:43:53 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: 705477 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3tdRvY13QPz9vFY for ; Wed, 14 Dec 2016 04:45:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X7CfO8M7"; dkim-atps=neutral Received: from localhost ([::1]:39811 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGr9I-0005oh-1c for incoming@patchwork.ozlabs.org; Tue, 13 Dec 2016 12:45:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60546) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGr8Z-0005Xu-06 for qemu-devel@nongnu.org; Tue, 13 Dec 2016 12:45:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cGr8U-0002rD-Dh for qemu-devel@nongnu.org; Tue, 13 Dec 2016 12:45:10 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:33655) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cGr8U-0002qK-1r for qemu-devel@nongnu.org; Tue, 13 Dec 2016 12:45:06 -0500 Received: by mail-lf0-f67.google.com with SMTP id y21so4275884lfa.0 for ; Tue, 13 Dec 2016 09:45:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=/c/02boD+W5beo+cqz2bjXmcylTEo+UmG3jHct+MUVY=; b=X7CfO8M7wwnxg8EM3pdQHULvXOFyI/mtvA8jYIQrlZ5QfgQTnryI6sXkclGbq/832s 1z8hUZaBdkimdpcdExbjNNPP8+WMIYlTpoVSzFM+HAH9hJjfsU2YboVmW2OXYsEQaEgv sFHX8U1qVUyp4ReDes+KmrMIQE3a7Df7RQ4pMxd/9Irva1gsgeLhQRKqQZlinrpN5ghO EjjpFySFecbGunYbAatJlqnh+GW8VL/7rxQf6QN9y5hDPuyYuadacm8WuDyN2oH8dvRF n9it0rrBz/w7ZY+zmISRwI+JZ9j4v19muyfg2yD4CGQuqGNLvaOqu2ejkvIFKDCSPf2l 3J/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/c/02boD+W5beo+cqz2bjXmcylTEo+UmG3jHct+MUVY=; b=FbGV0GHYGOBw2ebp42UZP7eIZ/F/Ac0dIZ+rJrg3Eiv/UefYHr6Eh02LfAuatwVPQe jUb/w/rZcNPDXyhi9NbSxZu5IZ5maVzW5hIQHpaUKbCCS/F6xWiOgvEGjwQbIgp9EdC8 durjdD41UabY2S12zAU/UolnspF3Jrdk5fchsRmPhyON49hq2Z2xjEI9VZn1+AEkCLaJ cP7HaPAXyTRnd8do1XJ4l+XnZ9Ho8l1zc+XUAYOpfJabTU8+MdYYBQzXSZpUoZtcEsZB 17csqYA5Y9j0XCUYVJQZQP4SsbeRkCbEt1xgGmqkCv/tQ3AZyXzS4yvbqt/MVhquR59r xC+A== X-Gm-Message-State: AKaTC01fYfei5eItGEK//Dvt1WmLy8RV/O4oNdVHJzYTl32kTtMyRx9ZoAkY105mYJqw89PGkjjt53UO7c9PNg== X-Received: by 10.25.209.73 with SMTP id i70mr25222791lfg.24.1481651044441; Tue, 13 Dec 2016 09:44:04 -0800 (PST) MIME-Version: 1.0 References: <583d59a6.dcc6370a.3a361.b5d4@mx.google.com> In-Reply-To: From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Tue, 13 Dec 2016 17:43:53 +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: 209.85.215.67 X-Content-Filtered-By: Mailman/MimeDel 2.1.21 Subject: Re: [Qemu-devel] [PATCH] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Hi On Tue, Dec 13, 2016 at 11:56 AM Li Qiang wrote: > Ping! > > 2016-11-29 18:33 GMT+08:00 Li Qiang : > > > From: Li Qiang > > > > Currently the ac97 device emulation doesn't have a exit function, > > hot unplug this device will leak some leak. Add a exit function to > > avoid this. > > > > Signed-off-by: Li Qiang > > --- > > hw/audio/ac97.c | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c > > index cbd959e..2faed35 100644 > > --- a/hw/audio/ac97.c > > +++ b/hw/audio/ac97.c > > @@ -1387,6 +1387,13 @@ 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); > > + > > + AUD_remove_card(&s->card); > > +} > > + > Looks good, but even better is to close the streams diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 2faed35627..3dcfe9d67c 100644 We could also investigate if AUD_remove_card could do that instead. > static int ac97_init (PCIBus *bus) > > { > > pci_create_simple (bus, -1, "AC97"); > > @@ -1404,6 +1411,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 > > > > > --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -1391,6 +1391,9 @@ static void ac97_exit(PCIDevice *dev) { AC97LinkState *s = DO_UPCAST(AC97LinkState, dev, dev); + AUD_close_in (&s->card, s->voice_pi); + AUD_close_out (&s->card, s->voice_po); + AUD_close_in (&s->card, s->voice_mc); AUD_remove_card(&s->card); }