From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
libvir-list@redhat.com, "Hervé Poussineau" <hpoussin@reactos.org>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
qemu-ppc@nongnu.org, "Richard Henderson" <rth@twiddle.net>
Subject: [PATCH v3 04/19] audio: deprecate -soundhw ac97
Date: Mon, 22 Jun 2020 13:28:59 +0200 [thread overview]
Message-ID: <20200622112914.30454-5-kraxel@redhat.com> (raw)
In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com>
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
next prev parent reply other threads:[~2020-06-22 11:31 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-22 11:28 [PATCH v3 00/19] audio: deprecate -soundhw Gerd Hoffmann
2020-06-22 11:28 ` [PATCH v3 01/19] stubs: add isa_create_simple Gerd Hoffmann
2020-06-22 11:28 ` [PATCH v3 02/19] stubs: add pci_create_simple Gerd Hoffmann
2020-06-22 11:28 ` [PATCH v3 03/19] audio: add deprecated_register_soundhw Gerd Hoffmann
2020-06-22 11:28 ` Gerd Hoffmann [this message]
2020-06-22 11:29 ` [PATCH v3 05/19] audio: deprecate -soundhw es1370 Gerd Hoffmann
2020-06-22 11:29 ` [PATCH v3 06/19] audio: deprecate -soundhw adlib Gerd Hoffmann
2020-06-22 11:29 ` [PATCH v3 07/19] audio: deprecate -soundhw cs4231a Gerd Hoffmann
2020-06-22 11:29 ` [PATCH v3 08/19] audio: deprecate -soundhw gus Gerd Hoffmann
2020-06-22 11:29 ` [PATCH v3 09/19] audio: deprecate -soundhw sb16 Gerd Hoffmann
2020-06-22 11:29 ` [PATCH v3 10/19] audio: deprecate -soundhw hda Gerd Hoffmann
2020-06-22 11:29 ` [PATCH v3 11/19] audio: deprecate -soundhw pcspk Gerd Hoffmann
2020-06-22 12:59 ` Thomas Huth
2020-06-22 13:07 ` Philippe Mathieu-Daudé
2020-06-22 13:25 ` Paolo Bonzini
2020-06-22 13:22 ` Paolo Bonzini
2020-06-22 14:03 ` Gerd Hoffmann
2020-06-22 14:35 ` Paolo Bonzini
2020-06-22 13:38 ` Gerd Hoffmann
2020-06-22 11:29 ` [PATCH v3 12/19] audio: add soundhw deprecation notice Gerd Hoffmann
2020-06-22 11:42 ` Daniel P. Berrangé
2020-06-22 12:12 ` Gerd Hoffmann
2020-06-22 11:29 ` [PATCH v3 13/19] pc_basic_device_init: pass PCMachineState Gerd Hoffmann
2020-06-22 11:29 ` [PATCH v3 14/19] pc_basic_device_init: drop has_pit arg Gerd Hoffmann
2020-06-22 11:29 ` [PATCH v3 15/19] pc_basic_device_init: drop no_vmport arg Gerd Hoffmann
2020-06-22 11:29 ` [PATCH v3 16/19] softmmu: initialize spice and audio earlier Gerd Hoffmann
2020-06-22 11:29 ` [PATCH v3 17/19] audio: rework pcspk_init() Gerd Hoffmann
2020-06-22 11:29 ` [PATCH v3 18/19] audio: create pcspk device early, add audiodev alias Gerd Hoffmann
2020-06-22 11:29 ` [PATCH v3 19/19] audio: set default value for pcspk.iobase property Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200622112914.30454-5-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=berrange@redhat.com \
--cc=ehabkost@redhat.com \
--cc=hpoussin@reactos.org \
--cc=libvir-list@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).