diff mbox

[v3] audio: ac97: add exit function

Message ID 58520052.4825ed0a.27a71.6cae@mx.google.com
State New
Headers show

Commit Message

Li Qiang Dec. 15, 2016, 2:30 a.m. UTC 
From: Li Qiang <liqiang6-s@360.cn>

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 <liqiang6-s@360.cn>
---

Changes since the v2:
take out of the null check

Changes since the v1:
close the streams

 hw/audio/ac97.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Marc-André Lureau Dec. 16, 2016, 8:54 a.m. UTC | #1 
On Thu, Dec 15, 2016 at 5:30 AM Li Qiang <liq3ea@gmail.com> wrote:

> From: Li Qiang <liqiang6-s@360.cn>
>
> 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 <liqiang6-s@360.cn>
>


Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>



> ---
>
> Changes since the v2:
> take out of the null check
>
> Changes since the v1:
> close the streams
>
>  hw/audio/ac97.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
> index cbd959e..c306575 100644
> --- a/hw/audio/ac97.c
> +++ b/hw/audio/ac97.c
> @@ -1387,6 +1387,16 @@ 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_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);
> +}
> +
>  static int ac97_init (PCIBus *bus)
>  {
>      pci_create_simple (bus, -1, "AC97");
> @@ -1404,6 +1414,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
>
> --
Marc-André Lureau
diff mbox

Patch

diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
index cbd959e..c306575 100644
--- a/hw/audio/ac97.c
+++ b/hw/audio/ac97.c
@@ -1387,6 +1387,16 @@  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_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);
+}
+
 static int ac97_init (PCIBus *bus)
 {
     pci_create_simple (bus, -1, "AC97");
@@ -1404,6 +1414,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;