qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: libvir-list@redhat.com, "Paolo Bonzini" <pbonzini@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [PATCH v2 05/13] audio: deprecate -soundhw es1370
Date: Fri, 15 May 2020 16:35:20 +0200	[thread overview]
Message-ID: <20200515143528.13591-6-kraxel@redhat.com> (raw)
In-Reply-To: <20200515143528.13591-1-kraxel@redhat.com>

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 <kraxel@redhat.com>
---
 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



  parent reply	other threads:[~2020-05-15 14:44 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-15 14:35 [PATCH v2 00/13] audio: deprecate -soundhw Gerd Hoffmann
2020-05-15 14:35 ` [PATCH v2 01/13] stubs: add isa_create_simple Gerd Hoffmann
2020-05-15 14:35 ` [PATCH v2 02/13] stubs: add pci_create_simple Gerd Hoffmann
2020-05-15 14:35 ` [PATCH v2 03/13] audio: add deprecated_register_soundhw Gerd Hoffmann
2020-05-15 14:35 ` [PATCH v2 04/13] audio: deprecate -soundhw ac97 Gerd Hoffmann
2020-05-15 14:35 ` Gerd Hoffmann [this message]
2020-05-15 14:35 ` [PATCH v2 06/13] audio: deprecate -soundhw adlib Gerd Hoffmann
2020-05-15 14:35 ` [PATCH v2 07/13] audio: deprecate -soundhw cs4231a Gerd Hoffmann
2020-05-15 14:35 ` [PATCH v2 08/13] audio: deprecate -soundhw gus Gerd Hoffmann
2020-05-15 14:35 ` [PATCH v2 09/13] audio: deprecate -soundhw sb16 Gerd Hoffmann
2020-05-15 14:35 ` [PATCH v2 10/13] audio: deprecate -soundhw hda Gerd Hoffmann
2020-05-15 14:35 ` [PATCH v2 11/13] audio: deprecate -soundhw pcspk Gerd Hoffmann
2020-05-15 15:08   ` Ján Tomko
2020-05-18 10:16     ` Gerd Hoffmann
2020-05-18 10:26       ` Daniel P. Berrangé
2020-05-18 10:55         ` Ján Tomko
2020-05-18 11:24         ` Gerd Hoffmann
2020-05-18 12:59           ` Gerd Hoffmann
2020-05-18 13:16             ` Markus Armbruster
2020-05-18 13:27               ` Gerd Hoffmann
2020-05-21 14:08                 ` Paolo Bonzini
2020-05-15 14:35 ` [PATCH v2 12/13] audio: add soundhw deprecation notice Gerd Hoffmann
2020-05-15 14:35 ` [PATCH v2 13/13] [RFC] audio: try use onboard audiodev for pcspk Gerd Hoffmann
2020-05-18 10:42 ` [PATCH v2 00/13] audio: deprecate -soundhw Paolo Bonzini

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=20200515143528.13591-6-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=berrange@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=libvir-list@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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).