diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2020-07-02 15:25:10 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2020-07-06 17:01:11 +0200 |
| commit | 0e933febfeba7e4fffd6319e42388ba132520461 (patch) | |
| tree | 7383dd2500487b5e4f57114b8b81d33e16a1ae4d | |
| parent | 2957f5ada7514f72032a419d8e3ba380786fca04 (diff) | |
| download | qemu-0e933febfeba7e4fffd6319e42388ba132520461.zip qemu-0e933febfeba7e4fffd6319e42388ba132520461.tar.gz qemu-0e933febfeba7e4fffd6319e42388ba132520461.tar.bz2 | |
audio: deprecate -soundhw es1370
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>
Message-id: 20200702132525.6849-6-kraxel@redhat.com
| -rw-r--r-- | hw/audio/es1370.c | 9 | ||||
| -rw-r--r-- | qdev-monitor.c | 1 |
2 files changed, 3 insertions, 7 deletions
diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index 5f8a83f..4255463 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -884,12 +884,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(), @@ -928,7 +922,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 105d979..e3083fa 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 }, |