[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/13] audio: deprecate -soundhw es1370
From: |
Gerd Hoffmann |
Subject: |
[PATCH v2 05/13] audio: deprecate -soundhw es1370 |
Date: |
Fri, 15 May 2020 16:35:20 +0200 |
Switch to deprecated_register_soundhw(). Remove the now obsolete init
function. Add an alias so both es1370 and ES1370 are working with
-device.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/audio/es1370.c | 9 ++-------
qdev-monitor.c | 1 +
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c
index 89c4dabcd44f..f36ed95ac93f 100644
--- a/hw/audio/es1370.c
+++ b/hw/audio/es1370.c
@@ -881,12 +881,6 @@ static void es1370_exit(PCIDevice *dev)
AUD_remove_card(&s->card);
}
-static int es1370_init (PCIBus *bus)
-{
- pci_create_simple (bus, -1, TYPE_ES1370);
- return 0;
-}
-
static Property es1370_properties[] = {
DEFINE_AUDIO_PROPERTIES(ES1370State, card),
DEFINE_PROP_END_OF_LIST(),
@@ -925,7 +919,8 @@ static const TypeInfo es1370_info = {
static void es1370_register_types (void)
{
type_register_static (&es1370_info);
- pci_register_soundhw("es1370", "ENSONIQ AudioPCI ES1370", es1370_init);
+ deprecated_register_soundhw("es1370", "ENSONIQ AudioPCI ES1370",
+ 0, TYPE_ES1370);
}
type_init (es1370_register_types)
diff --git a/qdev-monitor.c b/qdev-monitor.c
index 9c3cb89473c6..748733215004 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -55,6 +55,7 @@ typedef struct QDevAlias
static const QDevAlias qdev_alias_table[] = {
{ "AC97", "ac97" }, /* -soundhw name */
{ "e1000", "e1000-82540em" },
+ { "ES1370", "es1370" }, /* -soundhw name */
{ "ich9-ahci", "ahci" },
{ "lsi53c895a", "lsi" },
{ "virtio-9p-ccw", "virtio-9p", QEMU_ARCH_S390X },
--
2.18.4
- [PATCH v2 00/13] audio: deprecate -soundhw, Gerd Hoffmann, 2020/05/15
- [PATCH v2 01/13] stubs: add isa_create_simple, Gerd Hoffmann, 2020/05/15
- [PATCH v2 06/13] audio: deprecate -soundhw adlib, Gerd Hoffmann, 2020/05/15
- [PATCH v2 08/13] audio: deprecate -soundhw gus, Gerd Hoffmann, 2020/05/15
- [PATCH v2 09/13] audio: deprecate -soundhw sb16, Gerd Hoffmann, 2020/05/15
- [PATCH v2 10/13] audio: deprecate -soundhw hda, Gerd Hoffmann, 2020/05/15
- [PATCH v2 07/13] audio: deprecate -soundhw cs4231a, Gerd Hoffmann, 2020/05/15
- [PATCH v2 12/13] audio: add soundhw deprecation notice, Gerd Hoffmann, 2020/05/15
- [PATCH v2 03/13] audio: add deprecated_register_soundhw, Gerd Hoffmann, 2020/05/15
- [PATCH v2 05/13] audio: deprecate -soundhw es1370,
Gerd Hoffmann <=
- [PATCH v2 13/13] [RFC] audio: try use onboard audiodev for pcspk, Gerd Hoffmann, 2020/05/15
- [PATCH v2 04/13] audio: deprecate -soundhw ac97, Gerd Hoffmann, 2020/05/15
- [PATCH v2 02/13] stubs: add pci_create_simple, Gerd Hoffmann, 2020/05/15
- [PATCH v2 11/13] audio: deprecate -soundhw pcspk, Gerd Hoffmann, 2020/05/15
- Re: [PATCH v2 11/13] audio: deprecate -soundhw pcspk, Ján Tomko, 2020/05/15
- Re: [PATCH v2 11/13] audio: deprecate -soundhw pcspk, Gerd Hoffmann, 2020/05/18
- Re: [PATCH v2 11/13] audio: deprecate -soundhw pcspk, Daniel P . Berrangé, 2020/05/18
- Re: [PATCH v2 11/13] audio: deprecate -soundhw pcspk, Ján Tomko, 2020/05/18
- Re: [PATCH v2 11/13] audio: deprecate -soundhw pcspk, Gerd Hoffmann, 2020/05/18
- Re: [PATCH v2 11/13] audio: deprecate -soundhw pcspk, Gerd Hoffmann, 2020/05/18