[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] audio: fix pc speaker init
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH] audio: fix pc speaker init |
Date: |
Wed, 23 Jan 2019 22:01:36 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 |
Hi Gerd,
On 1/18/19 1:22 PM, Gerd Hoffmann wrote:
> Get rid of the pcspk_state global, allow pc speaker
> be added using "-device isa-pcspk".
>
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
> hw/audio/pcspk.c | 35 +++++++++++++++--------------------
> 1 file changed, 15 insertions(+), 20 deletions(-)
>
> diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c
> index 908696d483..acd80eb674 100644
> --- a/hw/audio/pcspk.c
> +++ b/hw/audio/pcspk.c
> @@ -57,7 +57,6 @@ typedef struct {
> } PCSpkState;
>
> static const char *s_spk = "pcspk";
> -static PCSpkState *pcspk_state;
Yeah \o/
>
> static inline void generate_samples(PCSpkState *s)
> {
> @@ -111,22 +110,6 @@ static void pcspk_callback(void *opaque, int free)
> }
> }
>
> -static int pcspk_audio_init(ISABus *bus)
> -{
> - PCSpkState *s = pcspk_state;
> - struct audsettings as = {PCSPK_SAMPLE_RATE, 1, AUD_FMT_U8, 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");
Too bad you fixed this message, it was funny :)
> - return -1;
> - }
> -
> - return 0;
> -}
> -
> static uint64_t pcspk_io_read(void *opaque, hwaddr addr,
> unsigned size)
> {
> @@ -179,12 +162,20 @@ static void pcspk_initfn(Object *obj)
>
> static void pcspk_realizefn(DeviceState *dev, Error **errp)
> {
> + struct audsettings as = {PCSPK_SAMPLE_RATE, 1, AUD_FMT_U8, 0};
> ISADevice *isadev = ISA_DEVICE(dev);
> PCSpkState *s = PC_SPEAKER(dev);
>
> isa_register_ioport(isadev, &s->ioport, s->iobase);
>
> - pcspk_state = s;
> + 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) {
> + error_setg (errp, "Initializing audio voice failed");
> + AUD_remove_card (&s->card);
> + return;
> + }
> }
>
> static bool migrate_needed(void *opaque)
> @@ -221,8 +212,6 @@ static void pcspk_class_initfn(ObjectClass *klass, void
> *data)
> set_bit(DEVICE_CATEGORY_SOUND, dc->categories);
> dc->vmsd = &vmstate_spk;
> dc->props = pcspk_properties;
> - /* Reason: realize sets global pcspk_state */
> - dc->user_creatable = false;
> }
>
> static const TypeInfo pcspk_info = {
> @@ -233,6 +222,12 @@ static const TypeInfo pcspk_info = {
> .class_init = pcspk_class_initfn,
> };
>
> +static int pcspk_audio_init(ISABus *bus)
> +{
> + isa_create_simple (bus, TYPE_PC_SPEAKER);
> + return 0;
Previously we had soundhw_init() calling pcspk_audio_init() and ignore
failures. Now since you use isa_create_simple() which calls
qdev_init_nofail(), failure will directly exit(1).
Is it the expected behavior?
If not, we can keep the current behavior using:
if (isa_try_create(bus, TYPE_PC_SPEAKER) == NULL) {
return -1;
}
return 0;
Regards,
Phil.
> +}
> +
> static void pcspk_register(void)
> {
> type_register_static(&pcspk_info);
>