| Message ID | 585200c9.a968ca0a.1ab80.4c98@mx.google.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Dec 15, 2016 at 5:32 AM Li Qiang <liq3ea@gmail.com> wrote: > From: Li Qiang <liqiang6-s@360.cn> > > Currently the es1370 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/es1370.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c > index 8449b5f..883ec69 100644 > --- a/hw/audio/es1370.c > +++ b/hw/audio/es1370.c > @@ -1041,6 +1041,19 @@ static void es1370_realize(PCIDevice *dev, Error > **errp) > es1370_reset (s); > } > > +static void es1370_exit(PCIDevice *dev) > +{ > + ES1370State *s = ES1370(dev); > + int i; > + > + for (i = 0; i < 2; ++i) { > + AUD_close_out(&s->card, s->dac_voice[i]); > (I would suggest ARRAY_SIZE instead) Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > + } > + > + AUD_close_in(&s->card, s->adc_voice); > + AUD_remove_card(&s->card); > +} > + > static int es1370_init (PCIBus *bus) > { > pci_create_simple (bus, -1, TYPE_ES1370); > @@ -1053,6 +1066,7 @@ static void es1370_class_init (ObjectClass *klass, > void *data) > PCIDeviceClass *k = PCI_DEVICE_CLASS (klass); > > k->realize = es1370_realize; > + k->exit = es1370_exit; > k->vendor_id = PCI_VENDOR_ID_ENSONIQ; > k->device_id = PCI_DEVICE_ID_ENSONIQ_ES1370; > k->class_id = PCI_CLASS_MULTIMEDIA_AUDIO; > -- > 1.8.3.1 > > -- Marc-André Lureau
diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index 8449b5f..883ec69 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -1041,6 +1041,19 @@ static void es1370_realize(PCIDevice *dev, Error **errp) es1370_reset (s); } +static void es1370_exit(PCIDevice *dev) +{ + ES1370State *s = ES1370(dev); + int i; + + for (i = 0; i < 2; ++i) { + AUD_close_out(&s->card, s->dac_voice[i]); + } + + AUD_close_in(&s->card, s->adc_voice); + AUD_remove_card(&s->card); +} + static int es1370_init (PCIBus *bus) { pci_create_simple (bus, -1, TYPE_ES1370); @@ -1053,6 +1066,7 @@ static void es1370_class_init (ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS (klass); k->realize = es1370_realize; + k->exit = es1370_exit; k->vendor_id = PCI_VENDOR_ID_ENSONIQ; k->device_id = PCI_DEVICE_ID_ENSONIQ_ES1370; k->class_id = PCI_CLASS_MULTIMEDIA_AUDIO;