| Message ID | 20230929085112.983957-13-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Cleanup deprecated audio features, take 2 | expand |
On Fri, 29 Sep 2023, Paolo Bonzini wrote: > Now that all callers support setting an audiodev, forbid using the default > audiodev if any audiodev is defined on the command line. To make the > detection easier make AUD_register_card() return false on error. So this means that now qemu-system-ppc -M pegasos2 -audiodev sdl,id=au will give an error saying that audiodev must be specified but does not say it should be set on the machine so users will not know, as oppsed to now just getting a warning but things still working. This is not helpful. Why is this feature deprecated and what does removing bring that justifies this? Could we keep the more intuitive current behaviour and drop the deprecation instead unless removing this is needed for later patches as the current default handling is more convenient for command line users. Regards, BALATON Zoltan > Signed-off-by: Martin Kletzander <mkletzan@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > audio/audio.c | 16 ++++++++++------ > audio/audio.h | 2 +- > hw/arm/omap2.c | 2 +- > hw/audio/ac97.c | 6 +++++- > hw/audio/adlib.c | 6 ++++-- > hw/audio/cs4231a.c | 6 ++++-- > hw/audio/es1370.c | 5 ++++- > hw/audio/gus.c | 6 ++++-- > hw/audio/hda-codec.c | 5 ++++- > hw/audio/lm4549.c | 8 +++++--- > hw/audio/pcspk.c | 4 +--- > hw/audio/sb16.c | 6 ++++-- > hw/audio/via-ac97.c | 6 ++++-- > hw/audio/wm8750.c | 5 ++++- > hw/display/xlnx_dp.c | 6 ++++-- > hw/input/tsc210x.c | 2 +- > hw/usb/dev-audio.c | 5 ++++- > 17 files changed, 64 insertions(+), 32 deletions(-) > > diff --git a/audio/audio.c b/audio/audio.c > index 9da2eaece03..f0788345bf8 100644 > --- a/audio/audio.c > +++ b/audio/audio.c > @@ -1803,15 +1803,17 @@ static AudioState *audio_init(Audiodev *dev) > return s; > } > > -void AUD_register_card (const char *name, QEMUSoundCard *card) > +bool AUD_register_card (const char *name, QEMUSoundCard *card, Error **errp) > { > if (!card->state) { > + if (!QSIMPLEQ_EMPTY(&audiodevs)) { > + error_setg(errp, "No audiodev specified for %s", name); > + error_append_hint(errp, "Perhaps you wanted to set audiodev=%s?", > + QSIMPLEQ_FIRST(&audiodevs)->dev->id); > + return false; > + } > + > if (!QTAILQ_EMPTY(&audio_states)) { > - if (!legacy_config) { > - dolog("Device %s: audiodev default parameter is deprecated, please " > - "specify audiodev=%s\n", name, > - QTAILQ_FIRST(&audio_states)->dev->id); > - } > card->state = QTAILQ_FIRST(&audio_states); > } else { > if (QSIMPLEQ_EMPTY(&default_audiodevs)) { > @@ -1824,6 +1826,8 @@ void AUD_register_card (const char *name, QEMUSoundCard *card) > card->name = g_strdup (name); > memset (&card->entries, 0, sizeof (card->entries)); > QLIST_INSERT_HEAD(&card->state->card_head, card, entries); > + > + return true; > } > > void AUD_remove_card (QEMUSoundCard *card) > diff --git a/audio/audio.h b/audio/audio.h > index 34df8962a66..70b264d897d 100644 > --- a/audio/audio.h > +++ b/audio/audio.h > @@ -94,7 +94,7 @@ typedef struct QEMUAudioTimeStamp { > void AUD_vlog (const char *cap, const char *fmt, va_list ap) G_GNUC_PRINTF(2, 0); > void AUD_log (const char *cap, const char *fmt, ...) G_GNUC_PRINTF(2, 3); > > -void AUD_register_card (const char *name, QEMUSoundCard *card); > +bool AUD_register_card (const char *name, QEMUSoundCard *card, Error **errp); > void AUD_remove_card (QEMUSoundCard *card); > CaptureVoiceOut *AUD_add_capture( > AudioState *s, > diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c > index 41b1f596dca..f170728e7ec 100644 > --- a/hw/arm/omap2.c > +++ b/hw/arm/omap2.c > @@ -614,7 +614,7 @@ static struct omap_eac_s *omap_eac_init(struct omap_target_agent_s *ta, > s->codec.card.name = g_strdup(current_machine->audiodev); > s->codec.card.state = audio_state_by_name(s->codec.card.name, &error_fatal); > } > - AUD_register_card("OMAP EAC", &s->codec.card); > + AUD_register_card("OMAP EAC", &s->codec.card, &error_fatal); > > memory_region_init_io(&s->iomem, NULL, &omap_eac_ops, s, "omap.eac", > omap_l4_region_size(ta, 0)); > diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c > index c2a5ce062a1..6a7a2dc80c4 100644 > --- a/hw/audio/ac97.c > +++ b/hw/audio/ac97.c > @@ -1273,6 +1273,10 @@ static void ac97_realize(PCIDevice *dev, Error **errp) > AC97LinkState *s = AC97(dev); > uint8_t *c = s->dev.config; > > + if (!AUD_register_card ("ac97", &s->card, errp)) { > + return; > + } > + > /* TODO: no need to override */ > c[PCI_COMMAND] = 0x00; /* pcicmd pci command rw, ro */ > c[PCI_COMMAND + 1] = 0x00; > @@ -1306,7 +1310,7 @@ static void ac97_realize(PCIDevice *dev, Error **errp) > "ac97-nabm", 256); > pci_register_bar(&s->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nam); > pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nabm); > - AUD_register_card("ac97", &s->card); > + > ac97_on_reset(DEVICE(s)); > } > > diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c > index 5f979b1487d..bd73806d83a 100644 > --- a/hw/audio/adlib.c > +++ b/hw/audio/adlib.c > @@ -255,6 +255,10 @@ static void adlib_realizefn (DeviceState *dev, Error **errp) > AdlibState *s = ADLIB(dev); > struct audsettings as; > > + if (!AUD_register_card ("adlib", &s->card, errp)) { > + return; > + } > + > s->opl = OPLCreate (3579545, s->freq); > if (!s->opl) { > error_setg (errp, "OPLCreate %d failed", s->freq); > @@ -270,8 +274,6 @@ static void adlib_realizefn (DeviceState *dev, Error **errp) > as.fmt = AUDIO_FORMAT_S16; > as.endianness = AUDIO_HOST_ENDIANNESS; > > - AUD_register_card ("adlib", &s->card); > - > s->voice = AUD_open_out ( > &s->card, > s->voice, > diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c > index 5c6d6437320..3aa105748d3 100644 > --- a/hw/audio/cs4231a.c > +++ b/hw/audio/cs4231a.c > @@ -678,13 +678,15 @@ static void cs4231a_realizefn (DeviceState *dev, Error **errp) > return; > } > > + if (!AUD_register_card ("cs4231a", &s->card, errp)) { > + return; > + } > + > s->pic = isa_bus_get_irq(bus, s->irq); > k = ISADMA_GET_CLASS(s->isa_dma); > k->register_channel(s->isa_dma, s->dma, cs_dma_read, s); > > isa_register_ioport (d, &s->ioports, s->port); > - > - AUD_register_card ("cs4231a", &s->card); > } > > static Property cs4231a_properties[] = { > diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c > index 4f738a0ad88..90f73d4c23d 100644 > --- a/hw/audio/es1370.c > +++ b/hw/audio/es1370.c > @@ -853,6 +853,10 @@ static void es1370_realize(PCIDevice *dev, Error **errp) > ES1370State *s = ES1370(dev); > uint8_t *c = s->dev.config; > > + if (!AUD_register_card ("es1370", &s->card, errp)) { > + return; > + } > + > c[PCI_STATUS + 1] = PCI_STATUS_DEVSEL_SLOW >> 8; > > #if 0 > @@ -868,7 +872,6 @@ static void es1370_realize(PCIDevice *dev, Error **errp) > memory_region_init_io (&s->io, OBJECT(s), &es1370_io_ops, s, "es1370", 256); > pci_register_bar (&s->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io); > > - AUD_register_card ("es1370", &s->card); > es1370_reset (s); > } > > diff --git a/hw/audio/gus.c b/hw/audio/gus.c > index 787345ce543..6c2b586ca71 100644 > --- a/hw/audio/gus.c > +++ b/hw/audio/gus.c > @@ -241,14 +241,16 @@ static void gus_realizefn (DeviceState *dev, Error **errp) > IsaDmaClass *k; > struct audsettings as; > > + if (!AUD_register_card ("gus", &s->card, errp)) { > + return; > + } > + > s->isa_dma = isa_bus_get_dma(bus, s->emu.gusdma); > if (!s->isa_dma) { > error_setg(errp, "ISA controller does not support DMA"); > return; > } > > - AUD_register_card ("gus", &s->card); > - > as.freq = s->freq; > as.nchannels = 2; > as.fmt = AUDIO_FORMAT_S16; > diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c > index a26048cf15e..b9ad1f4c39e 100644 > --- a/hw/audio/hda-codec.c > +++ b/hw/audio/hda-codec.c > @@ -685,11 +685,14 @@ static void hda_audio_init(HDACodecDevice *hda, > const desc_param *param; > uint32_t i, type; > > + if (!AUD_register_card("hda", &a->card, errp)) { > + return; > + } > + > a->desc = desc; > a->name = object_get_typename(OBJECT(a)); > dprint(a, 1, "%s: cad %d\n", __func__, a->hda.cad); > > - AUD_register_card("hda", &a->card); > for (i = 0; i < a->desc->nnodes; i++) { > node = a->desc->nodes + i; > param = hda_codec_find_param(node, AC_PAR_AUDIO_WIDGET_CAP); > diff --git a/hw/audio/lm4549.c b/hw/audio/lm4549.c > index 418041bc9c6..e7bfcc4b9fe 100644 > --- a/hw/audio/lm4549.c > +++ b/hw/audio/lm4549.c > @@ -281,6 +281,11 @@ void lm4549_init(lm4549_state *s, lm4549_callback data_req_cb, void* opaque, > { > struct audsettings as; > > + /* Register an audio card */ > + if (!AUD_register_card("lm4549", &s->card, errp)) { > + return; > + } > + > /* Store the callback and opaque pointer */ > s->data_req_cb = data_req_cb; > s->opaque = opaque; > @@ -288,9 +293,6 @@ void lm4549_init(lm4549_state *s, lm4549_callback data_req_cb, void* opaque, > /* Init the registers */ > lm4549_reset(s); > > - /* Register an audio card */ > - AUD_register_card("lm4549", &s->card); > - > /* Open a default voice */ > as.freq = 48000; > as.nchannels = 2; > diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c > index daf92a4ce11..fe7f07ced21 100644 > --- a/hw/audio/pcspk.c > +++ b/hw/audio/pcspk.c > @@ -123,8 +123,6 @@ static int pcspk_audio_init(PCSpkState *s) > return 0; > } > > - AUD_register_card(s_spk, &s->card); > - > s->voice = AUD_open_out(&s->card, s->voice, s_spk, s, pcspk_callback, &as); > if (!s->voice) { > AUD_log(s_spk, "Could not open voice\n"); > @@ -191,7 +189,7 @@ static void pcspk_realizefn(DeviceState *dev, Error **errp) > > isa_register_ioport(isadev, &s->ioport, s->iobase); > > - if (s->card.state) { > + if (s->card.state && AUD_register_card(s_spk, &s->card, errp)) { > pcspk_audio_init(s); > } > > diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c > index 535ccccdc98..18f6d252db3 100644 > --- a/hw/audio/sb16.c > +++ b/hw/audio/sb16.c > @@ -1402,6 +1402,10 @@ static void sb16_realizefn (DeviceState *dev, Error **errp) > SB16State *s = SB16 (dev); > IsaDmaClass *k; > > + if (!AUD_register_card ("sb16", &s->card, errp)) { > + return; > + } > + > s->isa_hdma = isa_bus_get_dma(bus, s->hdma); > s->isa_dma = isa_bus_get_dma(bus, s->dma); > if (!s->isa_dma || !s->isa_hdma) { > @@ -1434,8 +1438,6 @@ static void sb16_realizefn (DeviceState *dev, Error **errp) > k->register_channel(s->isa_dma, s->dma, SB_read_DMA, s); > > s->can_write = 1; > - > - AUD_register_card ("sb16", &s->card); > } > > static Property sb16_properties[] = { > diff --git a/hw/audio/via-ac97.c b/hw/audio/via-ac97.c > index 676254b7a40..30095a4c7aa 100644 > --- a/hw/audio/via-ac97.c > +++ b/hw/audio/via-ac97.c > @@ -426,6 +426,10 @@ static void via_ac97_realize(PCIDevice *pci_dev, Error **errp) > ViaAC97State *s = VIA_AC97(pci_dev); > Object *o = OBJECT(s); > > + if (!AUD_register_card ("via-ac97", &s->card, errp)) { > + return; > + } > + > /* > * Command register Bus Master bit is documented to be fixed at 0 but it's > * needed for PCI DMA to work in QEMU. The pegasos2 firmware writes 0 here > @@ -445,8 +449,6 @@ static void via_ac97_realize(PCIDevice *pci_dev, Error **errp) > pci_register_bar(pci_dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->fm); > memory_region_init_io(&s->midi, o, &midi_ops, s, "via-ac97.midi", 4); > pci_register_bar(pci_dev, 2, PCI_BASE_ADDRESS_SPACE_IO, &s->midi); > - > - AUD_register_card ("via-ac97", &s->card); > } > > static void via_ac97_exit(PCIDevice *dev) > diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c > index b5722b37c36..57954a63144 100644 > --- a/hw/audio/wm8750.c > +++ b/hw/audio/wm8750.c > @@ -624,7 +624,10 @@ static void wm8750_realize(DeviceState *dev, Error **errp) > { > WM8750State *s = WM8750(dev); > > - AUD_register_card(CODEC, &s->card); > + if (!AUD_register_card(CODEC, &s->card, errp)) { > + return; > + } > + > wm8750_reset(I2C_SLAVE(s)); > } > > diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c > index 341e91e886f..eee8f33a584 100644 > --- a/hw/display/xlnx_dp.c > +++ b/hw/display/xlnx_dp.c > @@ -1302,6 +1302,10 @@ static void xlnx_dp_realize(DeviceState *dev, Error **errp) > DisplaySurface *surface; > struct audsettings as; > > + if (!AUD_register_card("xlnx_dp.audio", &s->aud_card, errp)) { > + return; > + } > + > aux_bus_realize(s->aux_bus); > > qdev_realize(DEVICE(s->dpcd), BUS(s->aux_bus), &error_fatal); > @@ -1320,8 +1324,6 @@ static void xlnx_dp_realize(DeviceState *dev, Error **errp) > as.fmt = AUDIO_FORMAT_S16; > as.endianness = 0; > > - AUD_register_card("xlnx_dp.audio", &s->aud_card); > - > s->amixer_output_stream = AUD_open_out(&s->aud_card, > s->amixer_output_stream, > "xlnx_dp.audio.out", > diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c > index e7960a50696..950506fb382 100644 > --- a/hw/input/tsc210x.c > +++ b/hw/input/tsc210x.c > @@ -1102,7 +1102,7 @@ static void tsc210x_init(TSC210xState *s, > s->card.name = g_strdup(current_machine->audiodev); > s->card.state = audio_state_by_name(s->card.name, &error_fatal); > } > - AUD_register_card(s->name, &s->card); > + AUD_register_card(s->name, &s->card, &error_fatal); > > qemu_register_reset((void *) tsc210x_reset, s); > vmstate_register(NULL, 0, vmsd, s); > diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c > index 8748c1ba040..d5ac1f8962e 100644 > --- a/hw/usb/dev-audio.c > +++ b/hw/usb/dev-audio.c > @@ -944,12 +944,15 @@ static void usb_audio_realize(USBDevice *dev, Error **errp) > USBAudioState *s = USB_AUDIO(dev); > int i; > > + if (!AUD_register_card(TYPE_USB_AUDIO, &s->card, errp)) { > + return; > + } > + > dev->usb_desc = s->multi ? &desc_audio_multi : &desc_audio; > > usb_desc_create_serial(dev); > usb_desc_init(dev); > s->dev.opaque = s; > - AUD_register_card(TYPE_USB_AUDIO, &s->card); > > s->out.altset = ALTSET_OFF; > s->out.vol.mute = false; >
On Fri, Sep 29, 2023 at 1:55 PM BALATON Zoltan <balaton@eik.bme.hu> wrote: > > On Fri, 29 Sep 2023, Paolo Bonzini wrote: > > Now that all callers support setting an audiodev, forbid using the default > > audiodev if any audiodev is defined on the command line. To make the > > detection easier make AUD_register_card() return false on error. > > So this means that now qemu-system-ppc -M pegasos2 -audiodev sdl,id=au > will give an error saying that audiodev must be specified but does not say > it should be set on the machine so users will not know, as oppsed to now > just getting a warning but things still working The plan is to extend -audio with -M audiodev= support, so you can use "-M pegasos2" for the default backend or "-M pegasos2 -audio sdl" for a specific one. I didn't include it yet because I also want to add support for something like "-audio none", removing the current QEMU_AUDIO_DRV special case that is needed by libqtest. > This is not helpful. Why > is this feature deprecated and what does removing bring that justifies > this? Could we keep the more intuitive current behaviour and drop the > deprecation instead unless removing this is needed for later patches as > the current default handling is more convenient for command line users. There's intuitivity, and there's behavior that is only intuitive if you are used to it. For example, -audiodev is the only backend that does something even if its id is never referenced. In that it's completely different from -blockdev/-chardev and from -object backends. The idea of this patch is that "-audiodev" means "opt out of all magic", but I'll drop it for now and wait until I figure out how to handle "-audio" without a model. Paolo
diff --git a/audio/audio.c b/audio/audio.c index 9da2eaece03..f0788345bf8 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1803,15 +1803,17 @@ static AudioState *audio_init(Audiodev *dev) return s; } -void AUD_register_card (const char *name, QEMUSoundCard *card) +bool AUD_register_card (const char *name, QEMUSoundCard *card, Error **errp) { if (!card->state) { + if (!QSIMPLEQ_EMPTY(&audiodevs)) { + error_setg(errp, "No audiodev specified for %s", name); + error_append_hint(errp, "Perhaps you wanted to set audiodev=%s?", + QSIMPLEQ_FIRST(&audiodevs)->dev->id); + return false; + } + if (!QTAILQ_EMPTY(&audio_states)) { - if (!legacy_config) { - dolog("Device %s: audiodev default parameter is deprecated, please " - "specify audiodev=%s\n", name, - QTAILQ_FIRST(&audio_states)->dev->id); - } card->state = QTAILQ_FIRST(&audio_states); } else { if (QSIMPLEQ_EMPTY(&default_audiodevs)) { @@ -1824,6 +1826,8 @@ void AUD_register_card (const char *name, QEMUSoundCard *card) card->name = g_strdup (name); memset (&card->entries, 0, sizeof (card->entries)); QLIST_INSERT_HEAD(&card->state->card_head, card, entries); + + return true; } void AUD_remove_card (QEMUSoundCard *card) diff --git a/audio/audio.h b/audio/audio.h index 34df8962a66..70b264d897d 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -94,7 +94,7 @@ typedef struct QEMUAudioTimeStamp { void AUD_vlog (const char *cap, const char *fmt, va_list ap) G_GNUC_PRINTF(2, 0); void AUD_log (const char *cap, const char *fmt, ...) G_GNUC_PRINTF(2, 3); -void AUD_register_card (const char *name, QEMUSoundCard *card); +bool AUD_register_card (const char *name, QEMUSoundCard *card, Error **errp); void AUD_remove_card (QEMUSoundCard *card); CaptureVoiceOut *AUD_add_capture( AudioState *s, diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index 41b1f596dca..f170728e7ec 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -614,7 +614,7 @@ static struct omap_eac_s *omap_eac_init(struct omap_target_agent_s *ta, s->codec.card.name = g_strdup(current_machine->audiodev); s->codec.card.state = audio_state_by_name(s->codec.card.name, &error_fatal); } - AUD_register_card("OMAP EAC", &s->codec.card); + AUD_register_card("OMAP EAC", &s->codec.card, &error_fatal); memory_region_init_io(&s->iomem, NULL, &omap_eac_ops, s, "omap.eac", omap_l4_region_size(ta, 0)); diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index c2a5ce062a1..6a7a2dc80c4 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -1273,6 +1273,10 @@ static void ac97_realize(PCIDevice *dev, Error **errp) AC97LinkState *s = AC97(dev); uint8_t *c = s->dev.config; + if (!AUD_register_card ("ac97", &s->card, errp)) { + return; + } + /* TODO: no need to override */ c[PCI_COMMAND] = 0x00; /* pcicmd pci command rw, ro */ c[PCI_COMMAND + 1] = 0x00; @@ -1306,7 +1310,7 @@ static void ac97_realize(PCIDevice *dev, Error **errp) "ac97-nabm", 256); pci_register_bar(&s->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nam); pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nabm); - AUD_register_card("ac97", &s->card); + ac97_on_reset(DEVICE(s)); } diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index 5f979b1487d..bd73806d83a 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -255,6 +255,10 @@ static void adlib_realizefn (DeviceState *dev, Error **errp) AdlibState *s = ADLIB(dev); struct audsettings as; + if (!AUD_register_card ("adlib", &s->card, errp)) { + return; + } + s->opl = OPLCreate (3579545, s->freq); if (!s->opl) { error_setg (errp, "OPLCreate %d failed", s->freq); @@ -270,8 +274,6 @@ static void adlib_realizefn (DeviceState *dev, Error **errp) as.fmt = AUDIO_FORMAT_S16; as.endianness = AUDIO_HOST_ENDIANNESS; - AUD_register_card ("adlib", &s->card); - s->voice = AUD_open_out ( &s->card, s->voice, diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index 5c6d6437320..3aa105748d3 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.c @@ -678,13 +678,15 @@ static void cs4231a_realizefn (DeviceState *dev, Error **errp) return; } + if (!AUD_register_card ("cs4231a", &s->card, errp)) { + return; + } + s->pic = isa_bus_get_irq(bus, s->irq); k = ISADMA_GET_CLASS(s->isa_dma); k->register_channel(s->isa_dma, s->dma, cs_dma_read, s); isa_register_ioport (d, &s->ioports, s->port); - - AUD_register_card ("cs4231a", &s->card); } static Property cs4231a_properties[] = { diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index 4f738a0ad88..90f73d4c23d 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -853,6 +853,10 @@ static void es1370_realize(PCIDevice *dev, Error **errp) ES1370State *s = ES1370(dev); uint8_t *c = s->dev.config; + if (!AUD_register_card ("es1370", &s->card, errp)) { + return; + } + c[PCI_STATUS + 1] = PCI_STATUS_DEVSEL_SLOW >> 8; #if 0 @@ -868,7 +872,6 @@ static void es1370_realize(PCIDevice *dev, Error **errp) memory_region_init_io (&s->io, OBJECT(s), &es1370_io_ops, s, "es1370", 256); pci_register_bar (&s->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io); - AUD_register_card ("es1370", &s->card); es1370_reset (s); } diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 787345ce543..6c2b586ca71 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -241,14 +241,16 @@ static void gus_realizefn (DeviceState *dev, Error **errp) IsaDmaClass *k; struct audsettings as; + if (!AUD_register_card ("gus", &s->card, errp)) { + return; + } + s->isa_dma = isa_bus_get_dma(bus, s->emu.gusdma); if (!s->isa_dma) { error_setg(errp, "ISA controller does not support DMA"); return; } - AUD_register_card ("gus", &s->card); - as.freq = s->freq; as.nchannels = 2; as.fmt = AUDIO_FORMAT_S16; diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index a26048cf15e..b9ad1f4c39e 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -685,11 +685,14 @@ static void hda_audio_init(HDACodecDevice *hda, const desc_param *param; uint32_t i, type; + if (!AUD_register_card("hda", &a->card, errp)) { + return; + } + a->desc = desc; a->name = object_get_typename(OBJECT(a)); dprint(a, 1, "%s: cad %d\n", __func__, a->hda.cad); - AUD_register_card("hda", &a->card); for (i = 0; i < a->desc->nnodes; i++) { node = a->desc->nodes + i; param = hda_codec_find_param(node, AC_PAR_AUDIO_WIDGET_CAP); diff --git a/hw/audio/lm4549.c b/hw/audio/lm4549.c index 418041bc9c6..e7bfcc4b9fe 100644 --- a/hw/audio/lm4549.c +++ b/hw/audio/lm4549.c @@ -281,6 +281,11 @@ void lm4549_init(lm4549_state *s, lm4549_callback data_req_cb, void* opaque, { struct audsettings as; + /* Register an audio card */ + if (!AUD_register_card("lm4549", &s->card, errp)) { + return; + } + /* Store the callback and opaque pointer */ s->data_req_cb = data_req_cb; s->opaque = opaque; @@ -288,9 +293,6 @@ void lm4549_init(lm4549_state *s, lm4549_callback data_req_cb, void* opaque, /* Init the registers */ lm4549_reset(s); - /* Register an audio card */ - AUD_register_card("lm4549", &s->card); - /* Open a default voice */ as.freq = 48000; as.nchannels = 2; diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index daf92a4ce11..fe7f07ced21 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -123,8 +123,6 @@ static int pcspk_audio_init(PCSpkState *s) return 0; } - AUD_register_card(s_spk, &s->card); - s->voice = AUD_open_out(&s->card, s->voice, s_spk, s, pcspk_callback, &as); if (!s->voice) { AUD_log(s_spk, "Could not open voice\n"); @@ -191,7 +189,7 @@ static void pcspk_realizefn(DeviceState *dev, Error **errp) isa_register_ioport(isadev, &s->ioport, s->iobase); - if (s->card.state) { + if (s->card.state && AUD_register_card(s_spk, &s->card, errp)) { pcspk_audio_init(s); } diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index 535ccccdc98..18f6d252db3 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -1402,6 +1402,10 @@ static void sb16_realizefn (DeviceState *dev, Error **errp) SB16State *s = SB16 (dev); IsaDmaClass *k; + if (!AUD_register_card ("sb16", &s->card, errp)) { + return; + } + s->isa_hdma = isa_bus_get_dma(bus, s->hdma); s->isa_dma = isa_bus_get_dma(bus, s->dma); if (!s->isa_dma || !s->isa_hdma) { @@ -1434,8 +1438,6 @@ static void sb16_realizefn (DeviceState *dev, Error **errp) k->register_channel(s->isa_dma, s->dma, SB_read_DMA, s); s->can_write = 1; - - AUD_register_card ("sb16", &s->card); } static Property sb16_properties[] = { diff --git a/hw/audio/via-ac97.c b/hw/audio/via-ac97.c index 676254b7a40..30095a4c7aa 100644 --- a/hw/audio/via-ac97.c +++ b/hw/audio/via-ac97.c @@ -426,6 +426,10 @@ static void via_ac97_realize(PCIDevice *pci_dev, Error **errp) ViaAC97State *s = VIA_AC97(pci_dev); Object *o = OBJECT(s); + if (!AUD_register_card ("via-ac97", &s->card, errp)) { + return; + } + /* * Command register Bus Master bit is documented to be fixed at 0 but it's * needed for PCI DMA to work in QEMU. The pegasos2 firmware writes 0 here @@ -445,8 +449,6 @@ static void via_ac97_realize(PCIDevice *pci_dev, Error **errp) pci_register_bar(pci_dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->fm); memory_region_init_io(&s->midi, o, &midi_ops, s, "via-ac97.midi", 4); pci_register_bar(pci_dev, 2, PCI_BASE_ADDRESS_SPACE_IO, &s->midi); - - AUD_register_card ("via-ac97", &s->card); } static void via_ac97_exit(PCIDevice *dev) diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c index b5722b37c36..57954a63144 100644 --- a/hw/audio/wm8750.c +++ b/hw/audio/wm8750.c @@ -624,7 +624,10 @@ static void wm8750_realize(DeviceState *dev, Error **errp) { WM8750State *s = WM8750(dev); - AUD_register_card(CODEC, &s->card); + if (!AUD_register_card(CODEC, &s->card, errp)) { + return; + } + wm8750_reset(I2C_SLAVE(s)); } diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index 341e91e886f..eee8f33a584 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -1302,6 +1302,10 @@ static void xlnx_dp_realize(DeviceState *dev, Error **errp) DisplaySurface *surface; struct audsettings as; + if (!AUD_register_card("xlnx_dp.audio", &s->aud_card, errp)) { + return; + } + aux_bus_realize(s->aux_bus); qdev_realize(DEVICE(s->dpcd), BUS(s->aux_bus), &error_fatal); @@ -1320,8 +1324,6 @@ static void xlnx_dp_realize(DeviceState *dev, Error **errp) as.fmt = AUDIO_FORMAT_S16; as.endianness = 0; - AUD_register_card("xlnx_dp.audio", &s->aud_card); - s->amixer_output_stream = AUD_open_out(&s->aud_card, s->amixer_output_stream, "xlnx_dp.audio.out", diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c index e7960a50696..950506fb382 100644 --- a/hw/input/tsc210x.c +++ b/hw/input/tsc210x.c @@ -1102,7 +1102,7 @@ static void tsc210x_init(TSC210xState *s, s->card.name = g_strdup(current_machine->audiodev); s->card.state = audio_state_by_name(s->card.name, &error_fatal); } - AUD_register_card(s->name, &s->card); + AUD_register_card(s->name, &s->card, &error_fatal); qemu_register_reset((void *) tsc210x_reset, s); vmstate_register(NULL, 0, vmsd, s); diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index 8748c1ba040..d5ac1f8962e 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -944,12 +944,15 @@ static void usb_audio_realize(USBDevice *dev, Error **errp) USBAudioState *s = USB_AUDIO(dev); int i; + if (!AUD_register_card(TYPE_USB_AUDIO, &s->card, errp)) { + return; + } + dev->usb_desc = s->multi ? &desc_audio_multi : &desc_audio; usb_desc_create_serial(dev); usb_desc_init(dev); s->dev.opaque = s; - AUD_register_card(TYPE_USB_AUDIO, &s->card); s->out.altset = ALTSET_OFF; s->out.vol.mute = false;