9ca1972767
* gnu/packages/qemu.scm (qemu)[source]: Add patches. * gnu/packages/patches/qemu-CVE-2017-5525.patch, gnu/packages/patches/qemu-CVE-2017-5526.patch: New files. * gnu/local.mk (dist_patch_DATA): Register them.
59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
From 069eb7b2b8fc47c7cb52e5a4af23ea98d939e3da Mon Sep 17 00:00:00 2001
|
|
From: Li Qiang <liqiang6-s@360.cn>
|
|
Date: Wed, 14 Dec 2016 18:32:22 -0800
|
|
Subject: [PATCH] audio: es1370: add exit function
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=utf8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
http://git.qemu.org/?p=qemu.git;a=patch;h=069eb7b2b8fc47c7cb52e5a4af23ea98d939e3da
|
|
this patch is from qemu-git.
|
|
|
|
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>
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Message-id: 585200c9.a968ca0a.1ab80.4c98@mx.google.com
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
---
|
|
hw/audio/es1370.c | 14 ++++++++++++++
|
|
1 files changed, 14 insertions(+), 0 deletions(-)
|
|
|
|
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;
|
|
--
|
|
1.7.0.4
|
|
|