[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 04/20] audio: deprecate -soundhw ac97
From: |
Gerd Hoffmann |
Subject: |
[PATCH v5 04/20] audio: deprecate -soundhw ac97 |
Date: |
Thu, 2 Jul 2020 15:25:09 +0200 |
Switch to deprecated_register_soundhw(). Remove the now obsolete init
function. Add an alias so both ac97 and AC97 are working with -device.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/audio/ac97.c | 9 ++-------
qdev-monitor.c | 1 +
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
index 8a9b9924c495..38522cf0ba44 100644
--- a/hw/audio/ac97.c
+++ b/hw/audio/ac97.c
@@ -1393,12 +1393,6 @@ static void ac97_exit(PCIDevice *dev)
AUD_remove_card(&s->card);
}
-static int ac97_init (PCIBus *bus)
-{
- pci_create_simple(bus, -1, TYPE_AC97);
- return 0;
-}
-
static Property ac97_properties[] = {
DEFINE_AUDIO_PROPERTIES(AC97LinkState, card),
DEFINE_PROP_END_OF_LIST (),
@@ -1436,7 +1430,8 @@ static const TypeInfo ac97_info = {
static void ac97_register_types (void)
{
type_register_static (&ac97_info);
- pci_register_soundhw("ac97", "Intel 82801AA AC97 Audio", ac97_init);
+ deprecated_register_soundhw("ac97", "Intel 82801AA AC97 Audio",
+ 0, TYPE_AC97);
}
type_init (ac97_register_types)
diff --git a/qdev-monitor.c b/qdev-monitor.c
index 22da107484c5..105d9792ecdf 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -53,6 +53,7 @@ typedef struct QDevAlias
/* Please keep this table sorted by typename. */
static const QDevAlias qdev_alias_table[] = {
+ { "AC97", "ac97" }, /* -soundhw name */
{ "e1000", "e1000-82540em" },
{ "ich9-ahci", "ahci" },
{ "lsi53c895a", "lsi" },
--
2.18.4
- [PATCH v5 20/20] audio: set default value for pcspk.iobase property, (continued)
- [PATCH v5 20/20] audio: set default value for pcspk.iobase property, Gerd Hoffmann, 2020/07/02
- [PATCH v5 19/20] pcspk: update docs/system/target-i386-desc.rst.inc, Gerd Hoffmann, 2020/07/02
- [PATCH v5 09/20] audio: deprecate -soundhw sb16, Gerd Hoffmann, 2020/07/02
- [PATCH v5 18/20] audio: add soundhw deprecation notice, Gerd Hoffmann, 2020/07/02
- [PATCH v5 11/20] pc_basic_device_init: pass PCMachineState, Gerd Hoffmann, 2020/07/02
- [PATCH v5 05/20] audio: deprecate -soundhw es1370, Gerd Hoffmann, 2020/07/02
- [PATCH v5 10/20] audio: deprecate -soundhw hda, Gerd Hoffmann, 2020/07/02
- [PATCH v5 06/20] audio: deprecate -soundhw adlib, Gerd Hoffmann, 2020/07/02
- [PATCH v5 15/20] audio: rework pcspk_init(), Gerd Hoffmann, 2020/07/02
- [PATCH v5 04/20] audio: deprecate -soundhw ac97,
Gerd Hoffmann <=