Re: [Qemu-devel] Audio

Re: [Qemu-devel] Audio

[malc]

On Sun, 31 Oct 2004, Jason Brittain wrote:

> malc wrote:
> > Hello,
> >
> > At http://www.boblycat.org/~malc/code/patches/qemu/ you will find latest
> > (10_aqemu) audio patch.
>
> First, thanks for working on this!
>
> I patched my qemu with it.  The patch applied fine, built fine, and ran
> fine.  But, both before and after this patch, I still get no audio.
>
> Host:  Fedora Core 2 i386
> Guest: WinXP Corp.
>
> I'm using the -enable-audio command line switch to qemu.  Anything else
> I'd need to do?  XP finds no audio device at all.  Audio works fine
> in Fedora (natively).  And, I'm running no other applications that use
> the audio device while I run qemu to try it out.

What sound card and audio system (oss, alsa) do you use? Other guests
produce audio? Have you tried alternate audio output drivers
(QEMU_AUDIO_DRV=wav or sdl)? And also, i do not have WinXP license, so
there's relatively little i can do about it. Anybody else is having
problems with XP?

>
> Happy Halloween, and thanks again.  ;)
>
>

You are welcome.

-- 
mailto:malc@pulsesoft.com

Re: [Qemu-devel] Audio

[malc]

On Sun, 31 Oct 2004, Jason Brittain wrote:

> malc wrote:
> > Hello,
> >
> > At http://www.boblycat.org/~malc/code/patches/qemu/ you will find latest
> > (10_aqemu) audio patch.
>
> First, thanks for working on this!
>
> I patched my qemu with it.  The patch applied fine, built fine, and ran
> fine.  But, both before and after this patch, I still get no audio.
>
> Host:  Fedora Core 2 i386
> Guest: WinXP Corp.

Another thought. QEMU's SB16 is non PNP ISA device, so perhaps, you should
try to install device driver manually, make sure that settings are set
correctly IRQ=5 DMA8=1 DMA16=5, maybe then it'll work.

-- 
mailto:malc@pulsesoft.com

[Qemu-devel] Re: Audio

[Ronald]

Le Sun, 31 Oct 2004 18:18:08 +0300, malc a écrit :

> Hello,
Hi,

> 
> At http://www.boblycat.org/~malc/code/patches/qemu/ you will find latest
> (10_aqemu) audio patch. It boosts following improvements:
> 
> a. Correct IRQ status handling (Win95 sounds should no longer loop) b.
> save|load vm support
> c. Fixed WAV output driver
> d. Kludge to support SB16 under FreeBSD (can someone verify that it helps)
> e. Internal cleanups

I guess it's not on your priority list but I still experience problems on
windows host: qemu freeze on shutdown, sound play correctly with linux
guest but not with windows guest.
Otherwise on linux host everything seems ok, with alsa or oss drivers in
linux guest or with windows 98 guest, host is 2.6.9 with alsa+oss
emulation.

The following is a patch to Makefile.target after having 10_aqemu.patch.gz
applied

--- Makefile.target.bak 2004-11-01 13:02:08.845861544 +0100
+++ Makefile.target     2004-11-01 13:17:59.852649080 +0100
@@ -268,7 +268,10 @@
 VL_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o

 SOUND_HW = sb16.o
-AUDIODRV = audio.o ossaudio.o sdlaudio.o wavaudio.o
+AUDIODRV = audio.o sdlaudio.o wavaudio.o
+ifndef CONFIG_WIN32
+AUDIODRV+= ossaudio.o
+endif

 ifeq ($(TARGET_ARCH), i386)
 # Hardware support

Re: [Qemu-devel] Re: Audio

[malc]

On Mon, 1 Nov 2004, Ronald wrote:

> Le Sun, 31 Oct 2004 18:18:08 +0300, malc a ?crit :
>
> > Hello,
> Hi,
>
> >
> > At http://www.boblycat.org/~malc/code/patches/qemu/ you will find latest
> > (10_aqemu) audio patch. It boosts following improvements:
> >
> > a. Correct IRQ status handling (Win95 sounds should no longer loop) b.
> > save|load vm support
> > c. Fixed WAV output driver
> > d. Kludge to support SB16 under FreeBSD (can someone verify that it helps)
> > e. Internal cleanups
>
> I guess it's not on your priority list but I still experience problems on
> windows host: qemu freeze on shutdown, sound play correctly with linux
> guest but not with windows guest.
> Otherwise on linux host everything seems ok, with alsa or oss drivers in
> linux guest or with windows 98 guest, host is 2.6.9 with alsa+oss
> emulation.

This is not on my priority list for the simple reason that i don't have
any Windows host, so there's nothing i can do to fix it. Does sound play
correctly on Linux with QEMU_AUDIO_DRV set to sdl, shutdowns are ok?

>
> The following is a patch to Makefile.target after having 10_aqemu.patch.gz
> applied
>
> --- Makefile.target.bak 2004-11-01 13:02:08.845861544 +0100
> +++ Makefile.target     2004-11-01 13:17:59.852649080 +0100
> @@ -268,7 +268,10 @@
>  VL_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o
>
>  SOUND_HW = sb16.o
> -AUDIODRV = audio.o ossaudio.o sdlaudio.o wavaudio.o
> +AUDIODRV = audio.o sdlaudio.o wavaudio.o
> +ifndef CONFIG_WIN32
> +AUDIODRV+= ossaudio.o
> +endif
>
>  ifeq ($(TARGET_ARCH), i386)
>  # Hardware support

Thanks, but this is not correct solution, MacOS X and BSDs do not come
with OSS (by default at least), the logic of OSS selection should be
in configure.

-- 
mailto:malc@pulsesoft.com

[Qemu-devel] Re: Re: Audio

[Ronald]

Le Mon, 01 Nov 2004 15:43:37 +0300, malc a écrit :

> On Mon, 1 Nov 2004, Ronald wrote:
> 
>> Le Sun, 31 Oct 2004 18:18:08 +0300, malc a ?crit :
>>
>> > Hello,
>> Hi,
>>
>>
>> > At http://www.boblycat.org/~malc/code/patches/qemu/ you will find
>> > latest (10_aqemu) audio patch. It boosts following improvements:
>> >
>> > a. Correct IRQ status handling (Win95 sounds should no longer loop) b.
>> > save|load vm support
>> > c. Fixed WAV output driver
>> > d. Kludge to support SB16 under FreeBSD (can someone verify that it
>> > helps) e. Internal cleanups
>>
>> I guess it's not on your priority list but I still experience problems
>> on windows host: qemu freeze on shutdown, sound play correctly with
>> linux guest but not with windows guest.
>> Otherwise on linux host everything seems ok, with alsa or oss drivers in
>> linux guest or with windows 98 guest, host is 2.6.9 with alsa+oss
>> emulation.
> 
> This is not on my priority list for the simple reason that i don't have
> any Windows host, so there's nothing i can do to fix it. Does sound play
> correctly on Linux with QEMU_AUDIO_DRV set to sdl, shutdowns are ok?
> 

Sound playing is ok, but shutdown of win98 guest locks qemu and X, I must
switch to a tty and kill qemu, then relaunch it to get the mouse
working back. With linux guest shutdown is ok.

Re: [Qemu-devel] Re: Re: Audio

[zitu]

> Sound playing is ok, but shutdown of win98 guest locks qemu and X, I must
> switch to a tty and kill qemu, then relaunch it to get the mouse
> working back. With linux guest shutdown is ok.

First off, thanks for this patch. It allows windows hosts to also have sound
now from Qemu.

I believe the makefile should be changed, because ossaudio.c compilation
is not needed for windows hosts. But that's minor.

The shutdown pb related to sound card is observed with the following
guests: dos-6.22, win95osr, win98se.

Note that for dos, downloading a simple mod-player and a few test files,
letting it run, and then try to close qemu, one can hear that the audio
buffer is not fully clean when qemu tries to switch itself off. It then
usually hangs, and one has to kill the process by end. Brute force. :(

If you can reproduce this under freedos_guest on a linux_host, this
could help the debug of the audio driver.

Note that sb16 drivers from Creative install perfectly under dos :)

Zitu
--

Re: [Qemu-devel] Audio

[Jason Brittain]

malc wrote:
> On Sun, 31 Oct 2004, Jason Brittain wrote:
> 
>>malc wrote:
>>
>>>Hello,
>>>
>>>At http://www.boblycat.org/~malc/code/patches/qemu/ you will find latest
>>>(10_aqemu) audio patch.
>>
>>First, thanks for working on this!
>>
>>I patched my qemu with it.  The patch applied fine, built fine, and ran
>>fine.  But, both before and after this patch, I still get no audio.
>>
>>Host:  Fedora Core 2 i386
>>Guest: WinXP Corp.
>>
>>I'm using the -enable-audio command line switch to qemu.  Anything else
>>I'd need to do?  XP finds no audio device at all.  Audio works fine
>>in Fedora (natively).  And, I'm running no other applications that use
>>the audio device while I run qemu to try it out.
> 
> What sound card and audio system (oss, alsa) do you use? Other guests
> produce audio? Have you tried alternate audio output drivers
> (QEMU_AUDIO_DRV=wav or sdl)? And also, i do not have WinXP license, so
> there's relatively little i can do about it. Anybody else is having
> problems with XP?

I'm not sure if other guests produce audio.  Know how to test this
with the dsl iso?

I wasn't aware of QEMU_AUDIO_DRV.  I tried setting it to "sdl" before
starting qemu, and still XP ended up with no audio device.

Sound card info:
00:1f.5 Multimedia audio controller: Intel Corp. 82801DB (ICH4) AC'97 Audio Controller (rev 01)

Looks like I'm using oss.  Here's the list of modules I have loaded,
then below that my kernel config's audio settings.

Module                  Size  Used by
ipw2100                91484  0
tg3                    73988  0
ipt_MASQUERADE          3200  1
iptable_nat            20524  2 ipt_MASQUERADE
ip_conntrack           27656  2 ipt_MASQUERADE,iptable_nat
ip_tables              15488  2 ipt_MASQUERADE,iptable_nat
tun                     6528  0
loop                   12424  0
smbfs                  57592  0
snd_seq_oss            29312  0
snd_seq_midi_event      6272  1 snd_seq_oss
snd_seq                45456  4 snd_seq_oss,snd_seq_midi_event
nls_iso8859_1           4096  0
nls_cp437               5760  0
vfat                   11008  0
fat                    37568  1 vfat
sd_mod                 18688  0
usb_storage            60608  0
joydev                  8256  0
snd_pcm_oss            47656  0
snd_mixer_oss          16768  4 snd_pcm_oss
snd_intel8x0           28844  4
snd_ac97_codec         60420  1 snd_intel8x0
snd_pcm                80392  2 snd_pcm_oss,snd_intel8x0
snd_timer              19972  2 snd_seq,snd_pcm
snd_page_alloc          9096  2 snd_intel8x0,snd_pcm
gameport                3840  1 snd_intel8x0
snd_mpu401_uart         5760  1 snd_intel8x0
snd_rawmidi            19364  1 snd_mpu401_uart
snd_seq_device          7048  3 snd_seq_oss,snd_seq,snd_rawmidi
snd                    44644  14 snd_seq_oss,snd_seq_midi_event,snd_seq,snd_pcm_oss,snd_mixer_oss,snd_intel8x0,snd_ac97_codec,snd_pcm,snd_timer,snd_mpu401_uart,snd_rawmidi,snd_seq_device
soundcore               7008  4 snd
ieee80211              16516  1 ipw2100
ieee80211_crypt         4868  1 ieee80211
binfmt_misc             8968  1
parport_pc             21824  1
lp                      9516  0
parport                32584  2 parport_pc,lp
autofs4                15236  0
rfcomm                 30876  0
l2cap                  18564  5 rfcomm
bluetooth              38148  4 rfcomm,l2cap
ds                     13700  4
yenta_socket           17408  1
pcmcia_core            54852  2 ds,yenta_socket
sg                     32160  0
scsi_mod              100812  3 sd_mod,usb_storage,sg
microcode               5664  0
nls_utf8                1920  1
ntfs                  122868  1
dm_mod                 49660  0
uhci_hcd               28048  0
ehci_hcd               26628  0
radeon                120740  2
ext3                  103272  1
jbd                    47256  1 ext3


CONFIG_CHR_DEV_OSST=m
CONFIG_ISDN_AUDIO=y
CONFIG_SOUND_GAMEPORT=m
CONFIG_SOUND=m
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
CONFIG_SND_RAWMIDI=m
CONFIG_SND_SEQUENCER=m
CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM_OSS=m
CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_RTCTIMER=m
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set
CONFIG_SND_MPU401_UART=m
CONFIG_SND_OPL3_LIB=m
CONFIG_SND_OPL4_LIB=m
CONFIG_SND_VX_LIB=m
CONFIG_SND_DUMMY=m
CONFIG_SND_VIRMIDI=m
CONFIG_SND_MTPAV=m
# CONFIG_SND_SERIAL_U16550 is not set
CONFIG_SND_MPU401=m
CONFIG_SND_AD1816A=m
CONFIG_SND_AD1848=m
CONFIG_SND_CS4231=m
CONFIG_SND_CS4232=m
CONFIG_SND_CS4236=m
CONFIG_SND_ES968=m
CONFIG_SND_ES1688=m
CONFIG_SND_ES18XX=m
CONFIG_SND_GUSCLASSIC=m
CONFIG_SND_GUSEXTREME=m
CONFIG_SND_GUSMAX=m
CONFIG_SND_INTERWAVE=m
CONFIG_SND_INTERWAVE_STB=m
CONFIG_SND_OPTI92X_AD1848=m
CONFIG_SND_OPTI92X_CS4231=m
CONFIG_SND_OPTI93X=m
CONFIG_SND_SB8=m
CONFIG_SND_SB16=m
CONFIG_SND_SBAWE=m
CONFIG_SND_SB16_CSP=y
# CONFIG_SND_WAVEFRONT is not set
CONFIG_SND_ALS100=m
CONFIG_SND_AZT2320=m
CONFIG_SND_CMI8330=m
CONFIG_SND_DT019X=m
CONFIG_SND_OPL3SA2=m
CONFIG_SND_SGALAXY=m
CONFIG_SND_SSCAPE=m
CONFIG_SND_AC97_CODEC=m
CONFIG_SND_ALI5451=m
CONFIG_SND_ATIIXP=m
CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
CONFIG_SND_AZT3328=m
CONFIG_SND_BT87X=m
CONFIG_SND_CS46XX=m
CONFIG_SND_CS46XX_NEW_DSP=y
CONFIG_SND_CS4281=m
CONFIG_SND_EMU10K1=m
CONFIG_SND_KORG1212=m
CONFIG_SND_MIXART=m
CONFIG_SND_NM256=m
CONFIG_SND_RME32=m
CONFIG_SND_RME96=m
CONFIG_SND_RME9652=m
CONFIG_SND_HDSP=m
CONFIG_SND_TRIDENT=m
CONFIG_SND_YMFPCI=m
CONFIG_SND_ALS4000=m
CONFIG_SND_CMIPCI=m
CONFIG_SND_ENS1370=m
CONFIG_SND_ENS1371=m
CONFIG_SND_ES1938=m
CONFIG_SND_ES1968=m
CONFIG_SND_MAESTRO3=m
CONFIG_SND_FM801=m
CONFIG_SND_FM801_TEA575X=m
CONFIG_SND_ICE1712=m
CONFIG_SND_ICE1724=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
CONFIG_SND_SONICVIBES=m
CONFIG_SND_VIA82XX=m
CONFIG_SND_VX222=m
CONFIG_SND_USB_AUDIO=m
# CONFIG_SND_VXPOCKET is not set
# CONFIG_SND_VXP440 is not set
CONFIG_SND_PDAUDIOCF=m
# CONFIG_SOUND_PRIME is not set
CONFIG_USB_AUDIO=m

-- 
Jason Brittain
<jasonb@brittainweb.org>

[Qemu-devel] Re: Audio

[Ronald]

Le Thu, 04 Nov 2004 09:14:42 -0800, Jason Brittain a écrit :


> I'm not sure if other guests produce audio.  Know how to test this with
> the dsl iso?
> 

With dsl 0.8.1.1: 
# modprobe sb io=0x220 irq=5 dma=1 dma16=5 isapnp=0

Re: [Qemu-devel] Re: Audio

[Jason Brittain]

Ronald wrote:
> Le Thu, 04 Nov 2004 09:14:42 -0800, Jason Brittain a écrit :
> 
>>I'm not sure if other guests produce audio.  Know how to test this with
>>the dsl iso?
> 
> With dsl 0.8.1.1: 
> # modprobe sb io=0x220 irq=5 dma=1 dma16=5 isapnp=0

This command runs with no complaints, and dmesg says
"SB 4.05 detected OK (220)", so I assume that works, although
dsl doesn't seem to come with any wav files that I can play
to actually test playing sounds.  Maybe I can pull one down
from the net.  But, if it detects and configures the device,
I'd mostly expect it to work.  This is with QEMU_AUDIO_DRV set
to "oss" on my machine.

-- 
Jason Brittain

Re: [Qemu-devel] Re: Audio

[Jason Brittain]

Jason Brittain wrote:
> Ronald wrote:
> 
>> Le Thu, 04 Nov 2004 09:14:42 -0800, Jason Brittain a écrit :
>>
>>> I'm not sure if other guests produce audio.  Know how to test this with
>>> the dsl iso?
>>
>> With dsl 0.8.1.1: # modprobe sb io=0x220 irq=5 dma=1 dma16=5 isapnp=0
> 
> This command runs with no complaints, and dmesg says
> "SB 4.05 detected OK (220)", so I assume that works, although
> dsl doesn't seem to come with any wav files that I can play
> to actually test playing sounds.  Maybe I can pull one down
> from the net.  But, if it detects and configures the device,
> I'd mostly expect it to work.

Actually..  I catted /bin/grep > /dev/audio to see if I could
hear noise -- that didn't work.  Then, when I shut down dsl I
noticed this:

# qemu -user-net -enable-audio -cdrom dsl-0.8.2.iso
sb16: attempt to set DMA register 8bit 1, 16bit 5 (val=0x22)
sb16: bogus command 0xce

That could have happened when I executed the modprobe command
above.  Probably.  Seems like some kind of failure, but I
don't know the severity.

-- 
Jason Brittain

Re: [Qemu-devel] Audio

[malc]

On Thu, 4 Nov 2004, Jason Brittain wrote:

> malc wrote:
> > On Sun, 31 Oct 2004, Jason Brittain wrote:
> >
> >>malc wrote:
> >>
> >>>Hello,
> >>>
> >>>At http://www.boblycat.org/~malc/code/patches/qemu/ you will find latest
> >>>(10_aqemu) audio patch.
> >>
> >>First, thanks for working on this!
> >>
> >>I patched my qemu with it.  The patch applied fine, built fine, and ran
> >>fine.  But, both before and after this patch, I still get no audio.
> >>
> >>Host:  Fedora Core 2 i386
> >>Guest: WinXP Corp.
> >>
> >>I'm using the -enable-audio command line switch to qemu.  Anything else
> >>I'd need to do?  XP finds no audio device at all.  Audio works fine
> >>in Fedora (natively).  And, I'm running no other applications that use
> >>the audio device while I run qemu to try it out.

Let me reiterate, are you certain that the SB16 driver is installed on the
guest at all? I am not familiar with XP, but guess you should install it
manually.

>
> I wasn't aware of QEMU_AUDIO_DRV.  I tried setting it to "sdl" before
> starting qemu, and still XP ended up with no audio device.

The web page hosting the patch tells about QEMU_AUDIO_DRV pretty bluntly.

>
> Sound card info:
> 00:1f.5 Multimedia audio controller: Intel Corp. 82801DB (ICH4) AC'97 Audio Controller (rev 01)
>
> Looks like I'm using oss.  Here's the list of modules I have loaded,
> then below that my kernel config's audio settings.
>

You are most certainly running ALSA (with OSS emulation).

Again, if XP can not recognize SB or driver is not installed at all, no
amount of tweaking of your host audio will do much good. (Partly it's
mistake on my part to ask you to try different host audio drivers, sorry,
i wasn't reading your original message careful enough)

--
mailto:malc@pulsesoft.com

Re: [Qemu-devel] Re: Audio

[malc]

On Thu, 4 Nov 2004, Jason Brittain wrote:

> Jason Brittain wrote:
> > Ronald wrote:
> >
> >> Le Thu, 04 Nov 2004 09:14:42 -0800, Jason Brittain a ?crit :
> >>
> >>> I'm not sure if other guests produce audio.  Know how to test this with
> >>> the dsl iso?
> >>
> >> With dsl 0.8.1.1: # modprobe sb io=0x220 irq=5 dma=1 dma16=5 isapnp=0
> >
> > This command runs with no complaints, and dmesg says
> > "SB 4.05 detected OK (220)", so I assume that works, although
> > dsl doesn't seem to come with any wav files that I can play
> > to actually test playing sounds.  Maybe I can pull one down
> > from the net.  But, if it detects and configures the device,
> > I'd mostly expect it to work.
>
> Actually..  I catted /bin/grep > /dev/audio to see if I could
> hear noise -- that didn't work.  Then, when I shut down dsl I
> noticed this:
>
linux/Documentation/devices.txt

 14 char	Open Sound System (OSS)
		  0 = /dev/mixer	Mixer control
		  1 = /dev/sequencer	Audio sequencer
		  2 = /dev/midi00	First MIDI port
		  3 = /dev/dsp		Digital audio
		  4 = /dev/audio	Sun-compatible digital audio

So it's /dev/dsp where your grep should have been catted to.
(Sun-audio is probably some uLaw device and there's no support for this
in current SB16 implementation)

> # qemu -user-net -enable-audio -cdrom dsl-0.8.2.iso
> sb16: attempt to set DMA register 8bit 1, 16bit 5 (val=0x22)

That's something to be expected.

> sb16: bogus command 0xce

0xce is ADC command, ADC is not supported

>
> That could have happened when I executed the modprobe command
> above.  Probably.  Seems like some kind of failure, but I
> don't know the severity.
>
>

-- 
mailto:malc@pulsesoft.com

[Qemu-devel] using qemu gdb-stub to debug a linux guest

[Marc E. Fiuczynski]

I am trying to debug a linux kernel running as a guest on qemu. I can easily
connect from my gdb client via

# gdb vmlinux
(gdb) target remote localhost:1234
Remote debugging using localhost:1234
0x0000fff0 in ?? ()
warning: shared library handler failed to enable breakpoint

What does the above warning mean? Which shared library is it referring to?
The main thing that I *WANT* to do is use gdb to debug some kernel code.
Any hints or pointers at RTFM page would be great.

Thanks,
Marc

Re: [Qemu-devel] Re: Audio

[Jason Brittain]

malc wrote:
> On Thu, 4 Nov 2004, Jason Brittain wrote:
> 
>>Jason Brittain wrote:
>>
>>>Ronald wrote:
>>>
>>>>Le Thu, 04 Nov 2004 09:14:42 -0800, Jason Brittain a ?crit :
>>>>
>>>>>I'm not sure if other guests produce audio.  Know how to test this with
>>>>>the dsl iso?
>>>>
>>>>With dsl 0.8.1.1: # modprobe sb io=0x220 irq=5 dma=1 dma16=5 isapnp=0
>>>
>>>This command runs with no complaints, and dmesg says
>>>"SB 4.05 detected OK (220)", so I assume that works, although
>>>dsl doesn't seem to come with any wav files that I can play
>>>to actually test playing sounds.  Maybe I can pull one down
>>>from the net.  But, if it detects and configures the device,
>>>I'd mostly expect it to work.
>>
>>Actually..  I catted /bin/grep > /dev/audio to see if I could
>>hear noise -- that didn't work.  Then, when I shut down dsl I
>>noticed this:
> 
> linux/Documentation/devices.txt
> 
>  14 char	Open Sound System (OSS)
> 		  0 = /dev/mixer	Mixer control
> 		  1 = /dev/sequencer	Audio sequencer
> 		  2 = /dev/midi00	First MIDI port
> 		  3 = /dev/dsp		Digital audio
> 		  4 = /dev/audio	Sun-compatible digital audio
> 
> So it's /dev/dsp where your grep should have been catted to.
> (Sun-audio is probably some uLaw device and there's no support for this
> in current SB16 implementation)

You're quite right.  I tried again, this time with /dev/dsp,
and it works.  With that configuration, I'll see if I can get
XP to recognize the audio device.

-- 
Jason Brittain

Re: [Qemu-devel] Re: Audio

[Jens Arm]

> > # qemu -user-net -enable-audio -cdrom dsl-0.8.2.iso
> > sb16: attempt to set DMA register 8bit 1, 16bit 5 (val=0x22)
> 
> That's something to be expected.
> 
> > sb16: bogus command 0xce
> 
> 0xce is ADC command, ADC is not supported


I get with W2K SP4 the same errors


Jens

Re: [Qemu-devel] Re: Audio

[Jens Arm]

> > > # qemu -user-net -enable-audio -cdrom dsl-0.8.2.iso
> > > sb16: attempt to set DMA register 8bit 1, 16bit 5 (val=0x22)
> > 
> > That's something to be expected.
> > 
> > > sb16: bogus command 0xce
> > 
> > 0xce is ADC command, ADC is not supported
> 
> 
> I get with W2K SP4 the same errors

But I hear some very quiet trashy sound. (sound like a 44kHz file played with 1kHz)

Jens

Re: [Qemu-devel] Re: Audio

[malc]

On Tue, 15 Sep 2009, Avi Kivity wrote:

> On 09/13/2009 09:52 PM, malc wrote:
> > Thanks for the patch, but i was at a loss how to properly apply it
> > with git and retain all the relevant information (Subject/Authorhsip
> > etc), so for the time being it was applied manually.
> >    
> 
> 1. Save the email
> 2. 'git am -i --signoff /path/to/email'
> 3. delete all lines up to and including '------->' (might need to delete From:
> as well?)
> 4. save and exit

Tried and it works, thanks.

-- 
mailto:av1474@comtv.ru

[Qemu-devel] Re: Audio

[malc]

On Fri, 18 Sep 2009, Jan Kiszka wrote:

> Jan Kiszka wrote:
> > malc wrote:
> >> On Mon, 14 Sep 2009, Jan Kiszka wrote:
> >>
> >>> malc wrote:
> >>>> On Sun, 13 Sep 2009, Jan Kiszka wrote:
> >>>>
> >>>>> Jan Kiszka wrote:
> >>>>>> malc wrote:
> >>>>>>> Does following help?
> >>>> [..snip.]
> >>>>
> >>>>>> Nope, still full CPU load.
> >>>>> Forgot to mention: I also tried OSS before, but it suffered the same
> >>>>> way, and polling had to be disabled.
> >>>>>
> >>>> Aha, i've commited this patch and another which correct premature
> >>>> closure of audio device (for both OSS and ALSA), can not notice
> >>>> anything particularly wrong when running with poll enabled now, can
> >>>> you please retest things on your end, once again it would be nice to
> >>>> have both audio systems, tested. Thanks in advance.
> >>>>
> >>> Sorry, both audio systems still require to disable polling for a normal
> >>> cpu load.
> >> I believe the problem is within wm8750(/musicpal combination?)
> >> wm8750_set_format creates a bunch of ADC voices and enables them, but
> >> no reads are ever performed, so ALSA/OSS quickly fills the buffers
> >> and then stops reading into them thus leaving respective fd's in a
> >> selectable state. My main machine lacks ADC so i was unable to reproduce
> >> the behaviour you've seen on it on another box the issue is indeed very
> >> visible. Setting QEMU_OSS_ADC_DEV to /dev/moo or commenting out
> >> AUD_set_active_in in wm8750.c cures the problem as does, contrary to
> >> your report, setting QEMU_AUDIO_ADC_TRY_POLL to 0.
> > 
> > Cannot confirm this: Neither commenting out AUD_set_active_in nor
> > "tuning" QEMU_OSS_ADC_DEV makes any difference here.
> > 
> > But what I observed is that once I tune in some station / play some song
> > on the Musicpal, the load goes down and stays in normal range. Will dig
> > a bit in this direction, trying to find out what is different then.
> 
> The situation now looks like this:
> 
> QEMU_AUDIO_DAC_TRY_POLL=0 is required to avoid that Musicpal emulation
> generates high load after boot-up and before the first sound playback
> (interestingly not including the startup sound of the Musicpal). ADC
> subsystem or settings have no effect on this.

Just so that i have more information to try and reproduce it, can you
send me the output of -audio-help (so that i can see what values are
really set), the configure line (so that i can see whether i should
myself throw -enable-iothread into the mix) and perhaps the name of
the sound card.

> 
> Moreover, the playback quality under ALSA suffers in polling mode when
> the guest CPU is under load.
> 

Guest under load? Like when is musicpal under load (apart from
startup)?

> Jan
> 
> PS: Independent of the polling issue, QEMU_ALSA_DAC_BUFFER_SIZE=0
> currently gives skip-free playback for me while the default does not.
> Not sure what changed, but I suspect it's some local package.

What's the output when running with QEMU_ALSA_VERBOSE=1?

P.S. Please send the things to me directly, let's not polute the
     list with tons of uninteresting information.

-- 
mailto:av1474@comtv.ru

[Qemu-devel] Re: Audio

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 2458 bytes --]

Jan Kiszka wrote:
> malc wrote:
>> On Mon, 14 Sep 2009, Jan Kiszka wrote:
>>
>>> malc wrote:
>>>> On Sun, 13 Sep 2009, Jan Kiszka wrote:
>>>>
>>>>> Jan Kiszka wrote:
>>>>>> malc wrote:
>>>>>>> Does following help?
>>>> [..snip.]
>>>>
>>>>>> Nope, still full CPU load.
>>>>> Forgot to mention: I also tried OSS before, but it suffered the same
>>>>> way, and polling had to be disabled.
>>>>>
>>>> Aha, i've commited this patch and another which correct premature
>>>> closure of audio device (for both OSS and ALSA), can not notice
>>>> anything particularly wrong when running with poll enabled now, can
>>>> you please retest things on your end, once again it would be nice to
>>>> have both audio systems, tested. Thanks in advance.
>>>>
>>> Sorry, both audio systems still require to disable polling for a normal
>>> cpu load.
>> I believe the problem is within wm8750(/musicpal combination?)
>> wm8750_set_format creates a bunch of ADC voices and enables them, but
>> no reads are ever performed, so ALSA/OSS quickly fills the buffers
>> and then stops reading into them thus leaving respective fd's in a
>> selectable state. My main machine lacks ADC so i was unable to reproduce
>> the behaviour you've seen on it on another box the issue is indeed very
>> visible. Setting QEMU_OSS_ADC_DEV to /dev/moo or commenting out
>> AUD_set_active_in in wm8750.c cures the problem as does, contrary to
>> your report, setting QEMU_AUDIO_ADC_TRY_POLL to 0.
> 
> Cannot confirm this: Neither commenting out AUD_set_active_in nor
> "tuning" QEMU_OSS_ADC_DEV makes any difference here.
> 
> But what I observed is that once I tune in some station / play some song
> on the Musicpal, the load goes down and stays in normal range. Will dig
> a bit in this direction, trying to find out what is different then.

The situation now looks like this:

QEMU_AUDIO_DAC_TRY_POLL=0 is required to avoid that Musicpal emulation
generates high load after boot-up and before the first sound playback
(interestingly not including the startup sound of the Musicpal). ADC
subsystem or settings have no effect on this.

Moreover, the playback quality under ALSA suffers in polling mode when
the guest CPU is under load.

Jan

PS: Independent of the polling issue, QEMU_ALSA_DAC_BUFFER_SIZE=0
currently gives skip-free playback for me while the default does not.
Not sure what changed, but I suspect it's some local package.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

[Qemu-devel] Re: Audio

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1790 bytes --]

malc wrote:
> On Mon, 14 Sep 2009, Jan Kiszka wrote:
> 
>> malc wrote:
>>> On Sun, 13 Sep 2009, Jan Kiszka wrote:
>>>
>>>> Jan Kiszka wrote:
>>>>> malc wrote:
>>>>>> Does following help?
>>> [..snip.]
>>>
>>>>> Nope, still full CPU load.
>>>> Forgot to mention: I also tried OSS before, but it suffered the same
>>>> way, and polling had to be disabled.
>>>>
>>> Aha, i've commited this patch and another which correct premature
>>> closure of audio device (for both OSS and ALSA), can not notice
>>> anything particularly wrong when running with poll enabled now, can
>>> you please retest things on your end, once again it would be nice to
>>> have both audio systems, tested. Thanks in advance.
>>>
>> Sorry, both audio systems still require to disable polling for a normal
>> cpu load.
> 
> I believe the problem is within wm8750(/musicpal combination?)
> wm8750_set_format creates a bunch of ADC voices and enables them, but
> no reads are ever performed, so ALSA/OSS quickly fills the buffers
> and then stops reading into them thus leaving respective fd's in a
> selectable state. My main machine lacks ADC so i was unable to reproduce
> the behaviour you've seen on it on another box the issue is indeed very
> visible. Setting QEMU_OSS_ADC_DEV to /dev/moo or commenting out
> AUD_set_active_in in wm8750.c cures the problem as does, contrary to
> your report, setting QEMU_AUDIO_ADC_TRY_POLL to 0.

Cannot confirm this: Neither commenting out AUD_set_active_in nor
"tuning" QEMU_OSS_ADC_DEV makes any difference here.

But what I observed is that once I tune in some station / play some song
on the Musicpal, the load goes down and stays in normal range. Will dig
a bit in this direction, trying to find out what is different then.

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

Re: [Qemu-devel] Re: Audio

[Avi Kivity]

On 09/13/2009 09:52 PM, malc wrote:
> Thanks for the patch, but i was at a loss how to properly apply it
> with git and retain all the relevant information (Subject/Authorhsip
> etc), so for the time being it was applied manually.
>    

1. Save the email
2. 'git am -i --signoff /path/to/email'
3. delete all lines up to and including '------->' (might need to delete 
From: as well?)
4. save and exit

-- 
error compiling committee.c: too many arguments to function

[Qemu-devel] Re: Audio

[malc]

On Mon, 14 Sep 2009, Jan Kiszka wrote:

> malc wrote:
> > On Sun, 13 Sep 2009, Jan Kiszka wrote:
> > 
> >> Jan Kiszka wrote:
> >>> malc wrote:
> >>>> Does following help?
> > 
> > [..snip.]
> > 
> >>> Nope, still full CPU load.
> >> Forgot to mention: I also tried OSS before, but it suffered the same
> >> way, and polling had to be disabled.
> >>
> > 
> > Aha, i've commited this patch and another which correct premature
> > closure of audio device (for both OSS and ALSA), can not notice
> > anything particularly wrong when running with poll enabled now, can
> > you please retest things on your end, once again it would be nice to
> > have both audio systems, tested. Thanks in advance.
> > 
> 
> Sorry, both audio systems still require to disable polling for a normal
> cpu load.

I believe the problem is within wm8750(/musicpal combination?)
wm8750_set_format creates a bunch of ADC voices and enables them, but
no reads are ever performed, so ALSA/OSS quickly fills the buffers
and then stops reading into them thus leaving respective fd's in a
selectable state. My main machine lacks ADC so i was unable to reproduce
the behaviour you've seen on it on another box the issue is indeed very
visible. Setting QEMU_OSS_ADC_DEV to /dev/moo or commenting out
AUD_set_active_in in wm8750.c cures the problem as does, contrary to
your report, setting QEMU_AUDIO_ADC_TRY_POLL to 0.

-- 
mailto:av1474@comtv.ru

[Qemu-devel] Re: Audio

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 733 bytes --]

malc wrote:
> On Sun, 13 Sep 2009, Jan Kiszka wrote:
> 
>> Jan Kiszka wrote:
>>> malc wrote:
>>>> Does following help?
> 
> [..snip.]
> 
>>> Nope, still full CPU load.
>> Forgot to mention: I also tried OSS before, but it suffered the same
>> way, and polling had to be disabled.
>>
> 
> Aha, i've commited this patch and another which correct premature
> closure of audio device (for both OSS and ALSA), can not notice
> anything particularly wrong when running with poll enabled now, can
> you please retest things on your end, once again it would be nice to
> have both audio systems, tested. Thanks in advance.
> 

Sorry, both audio systems still require to disable polling for a normal
cpu load.

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

[Qemu-devel] Re: Audio

[malc]

On Sun, 13 Sep 2009, Jan Kiszka wrote:

> Jan Kiszka wrote:
> > malc wrote:
> >> Does following help?

[..snip.]

> > Nope, still full CPU load.
> 
> Forgot to mention: I also tried OSS before, but it suffered the same
> way, and polling had to be disabled.
> 

Aha, i've commited this patch and another which correct premature
closure of audio device (for both OSS and ALSA), can not notice
anything particularly wrong when running with poll enabled now, can
you please retest things on your end, once again it would be nice to
have both audio systems, tested. Thanks in advance.

-- 
mailto:av1474@comtv.ru

[Qemu-devel] Re: Audio

[malc]

On Sun, 13 Sep 2009, Jan Kiszka wrote:

> malc wrote:
> > On Sun, 13 Sep 2009, Jan Kiszka wrote:
> > 
> >> malc wrote:
> >>> The code was just commited that enables "polling" audio mode (oss and
> >>> alsa), it's also unconditionally enabled now to obtain some testing
> >>> coverage, so please give it a whirl, feedback is welcome.
> >> CPU load goes to 100% when starting my Musicpal image. Applying the fix
> >> below and disabling polling again cures this effect here.
> > 
> > Few things:
> > 
> > Thanks for the patch, but i was at a loss how to properly apply it
> > with git and retain all the relevant information (Subject/Authorhsip
> > etc), so for the time being it was applied manually.
> 
> Sorry, the patch was so trivial that I became sloppy.
> 
> > 
> > In the past your mail server was bouncing my replies to threads where
> > you paticipated, and since this new CC-ing madness is in place i'm not
> > sure whether the list reply was delivered to you either, hence i
> > emptied CC header and replying to the list alone.
> 
> Unless the bounce said "mailbox full": Just forward me a recent bounce
> message privately (replace web.de with siemens.com). Typically I get
> wrong black-listings resolved with web.de within a day or less.

No it was something else, i'll forward this message to you to try and
get the bounce.

> 
> > 
> > The Musicpal image i have here is getting stuck somewhere along the
> > way to the point of monitor not being responsive, so i can not test
> > anything myself. FWIW the command line is this:
> > 
> > [...]/arm-softmmu/qemu-system-arm \
> > -M musicpal \
> > -pflash flash.image \
> > -kernel u-boot.bin \
> > -monitor stdio \
> > -m 128 \
> > -redir tcp:8080::80 -redir tcp:2323::23
> 
> Hmm, this setup works for me (current master). Maybe you can catch what
> strace reports or which backtrace gdb generates. Does disabling polling
> or reverting before your changes make it boot again?

930c86820e8e0b6dfcf211bda5e835463d72ff42 is what broke it for me,
Following "fixes" it:

diff --git a/hw/musicpal.c b/hw/musicpal.c
index 1c4f17c..0fe9fd3 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -238,8 +238,8 @@ static void eth_send(mv88w8618_eth_state *s, int 
queue_index)
     uint8_t buf[2048];
     int len;
 
-
     do {
+        if (!desc_addr) return;
         eth_tx_desc_get(desc_addr, &desc);
         if (desc.cmdstat & MP_ETH_TX_OWN) {
             len = desc.bytes;

[..snip..]

Now that i have musicpal working, i'll try to investigate things further.

-- 
mailto:av1474@comtv.ru

[Qemu-devel] Re: Audio

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1998 bytes --]

Jan Kiszka wrote:
> malc wrote:
>> Does following help?
>>
>> diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
>> index 28c245d..9cc1372 100644
>> --- a/audio/alsaaudio.c
>> +++ b/audio/alsaaudio.c
>> @@ -37,6 +37,7 @@ struct pollhlp {
>>      snd_pcm_t *handle;
>>      struct pollfd *pfds;
>>      int count;
>> +    int mask;
>>  };
>>  
>>  typedef struct ALSAVoiceOut {
>> @@ -178,7 +179,7 @@ static void alsa_poll_handler (void *opaque)
>>          return;
>>      }
>>  
>> -    if (!(revents & POLLOUT)) {
>> +    if (!(revents & hlp->mask)) {
>>          if (conf.verbose) {
>>              dolog ("revents = %d\n", revents);
>>          }
>> @@ -208,7 +209,7 @@ static void alsa_poll_handler (void *opaque)
>>      }
>>  }
>>  
>> -static int alsa_poll_helper (snd_pcm_t *handle, struct pollhlp *hlp)
>> +static int alsa_poll_helper (snd_pcm_t *handle, struct pollhlp *hlp, int mask)
>>  {
>>      int i, count, err;
>>      struct pollfd *pfds;
>> @@ -265,6 +266,7 @@ static int alsa_poll_helper (snd_pcm_t *handle, struct pollhlp *hlp)
>>      hlp->pfds = pfds;
>>      hlp->count = count;
>>      hlp->handle = handle;
>> +    hlp->mask = mask;
>>      return 0;
>>  }
>>  
>> @@ -272,14 +274,14 @@ static int alsa_poll_out (HWVoiceOut *hw)
>>  {
>>      ALSAVoiceOut *alsa = (ALSAVoiceOut *) hw;
>>  
>> -    return alsa_poll_helper (alsa->handle, &alsa->pollhlp);
>> +    return alsa_poll_helper (alsa->handle, &alsa->pollhlp, POLLOUT);
>>  }
>>  
>>  static int alsa_poll_in (HWVoiceIn *hw)
>>  {
>>      ALSAVoiceIn *alsa = (ALSAVoiceIn *) hw;
>>  
>> -    return alsa_poll_helper (alsa->handle, &alsa->pollhlp);
>> +    return alsa_poll_helper (alsa->handle, &alsa->pollhlp, POLLIN);
>>  }
>>  
>>  static int alsa_write (SWVoiceOut *sw, void *buf, int len)
>>
>>
> 
> Nope, still full CPU load.

Forgot to mention: I also tried OSS before, but it suffered the same
way, and polling had to be disabled.

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

[Qemu-devel] Re: Audio

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 3650 bytes --]

malc wrote:
> On Sun, 13 Sep 2009, Jan Kiszka wrote:
> 
>> malc wrote:
>>> The code was just commited that enables "polling" audio mode (oss and
>>> alsa), it's also unconditionally enabled now to obtain some testing
>>> coverage, so please give it a whirl, feedback is welcome.
>> CPU load goes to 100% when starting my Musicpal image. Applying the fix
>> below and disabling polling again cures this effect here.
> 
> Few things:
> 
> Thanks for the patch, but i was at a loss how to properly apply it
> with git and retain all the relevant information (Subject/Authorhsip
> etc), so for the time being it was applied manually.

Sorry, the patch was so trivial that I became sloppy.

> 
> In the past your mail server was bouncing my replies to threads where
> you paticipated, and since this new CC-ing madness is in place i'm not
> sure whether the list reply was delivered to you either, hence i
> emptied CC header and replying to the list alone.

Unless the bounce said "mailbox full": Just forward me a recent bounce
message privately (replace web.de with siemens.com). Typically I get
wrong black-listings resolved with web.de within a day or less.

> 
> The Musicpal image i have here is getting stuck somewhere along the
> way to the point of monitor not being responsive, so i can not test
> anything myself. FWIW the command line is this:
> 
> [...]/arm-softmmu/qemu-system-arm \
> -M musicpal \
> -pflash flash.image \
> -kernel u-boot.bin \
> -monitor stdio \
> -m 128 \
> -redir tcp:8080::80 -redir tcp:2323::23

Hmm, this setup works for me (current master). Maybe you can catch what
strace reports or which backtrace gdb generates. Does disabling polling
or reverting before your changes make it boot again?

> 
> Is disabling of both DAC/ADC poll mode needed in your case or?

Yes.

> 
> Does following help?
> 
> diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
> index 28c245d..9cc1372 100644
> --- a/audio/alsaaudio.c
> +++ b/audio/alsaaudio.c
> @@ -37,6 +37,7 @@ struct pollhlp {
>      snd_pcm_t *handle;
>      struct pollfd *pfds;
>      int count;
> +    int mask;
>  };
>  
>  typedef struct ALSAVoiceOut {
> @@ -178,7 +179,7 @@ static void alsa_poll_handler (void *opaque)
>          return;
>      }
>  
> -    if (!(revents & POLLOUT)) {
> +    if (!(revents & hlp->mask)) {
>          if (conf.verbose) {
>              dolog ("revents = %d\n", revents);
>          }
> @@ -208,7 +209,7 @@ static void alsa_poll_handler (void *opaque)
>      }
>  }
>  
> -static int alsa_poll_helper (snd_pcm_t *handle, struct pollhlp *hlp)
> +static int alsa_poll_helper (snd_pcm_t *handle, struct pollhlp *hlp, int mask)
>  {
>      int i, count, err;
>      struct pollfd *pfds;
> @@ -265,6 +266,7 @@ static int alsa_poll_helper (snd_pcm_t *handle, struct pollhlp *hlp)
>      hlp->pfds = pfds;
>      hlp->count = count;
>      hlp->handle = handle;
> +    hlp->mask = mask;
>      return 0;
>  }
>  
> @@ -272,14 +274,14 @@ static int alsa_poll_out (HWVoiceOut *hw)
>  {
>      ALSAVoiceOut *alsa = (ALSAVoiceOut *) hw;
>  
> -    return alsa_poll_helper (alsa->handle, &alsa->pollhlp);
> +    return alsa_poll_helper (alsa->handle, &alsa->pollhlp, POLLOUT);
>  }
>  
>  static int alsa_poll_in (HWVoiceIn *hw)
>  {
>      ALSAVoiceIn *alsa = (ALSAVoiceIn *) hw;
>  
> -    return alsa_poll_helper (alsa->handle, &alsa->pollhlp);
> +    return alsa_poll_helper (alsa->handle, &alsa->pollhlp, POLLIN);
>  }
>  
>  static int alsa_write (SWVoiceOut *sw, void *buf, int len)
> 
> 

Nope, still full CPU load.

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

[Qemu-devel] Re: Audio

[malc]

On Sun, 13 Sep 2009, Jan Kiszka wrote:

> malc wrote:
> > The code was just commited that enables "polling" audio mode (oss and
> > alsa), it's also unconditionally enabled now to obtain some testing
> > coverage, so please give it a whirl, feedback is welcome.
>
> CPU load goes to 100% when starting my Musicpal image. Applying the fix
> below and disabling polling again cures this effect here.

Few things:

Thanks for the patch, but i was at a loss how to properly apply it
with git and retain all the relevant information (Subject/Authorhsip
etc), so for the time being it was applied manually.

In the past your mail server was bouncing my replies to threads where
you paticipated, and since this new CC-ing madness is in place i'm not
sure whether the list reply was delivered to you either, hence i
emptied CC header and replying to the list alone.

The Musicpal image i have here is getting stuck somewhere along the
way to the point of monitor not being responsive, so i can not test
anything myself. FWIW the command line is this:

[...]/arm-softmmu/qemu-system-arm \
-M musicpal \
-pflash flash.image \
-kernel u-boot.bin \
-monitor stdio \
-m 128 \
-redir tcp:8080::80 -redir tcp:2323::23

Is disabling of both DAC/ADC poll mode needed in your case or?

Does following help?

diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 28c245d..9cc1372 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -37,6 +37,7 @@ struct pollhlp {
     snd_pcm_t *handle;
     struct pollfd *pfds;
     int count;
+    int mask;
 };
 
 typedef struct ALSAVoiceOut {
@@ -178,7 +179,7 @@ static void alsa_poll_handler (void *opaque)
         return;
     }
 
-    if (!(revents & POLLOUT)) {
+    if (!(revents & hlp->mask)) {
         if (conf.verbose) {
             dolog ("revents = %d\n", revents);
         }
@@ -208,7 +209,7 @@ static void alsa_poll_handler (void *opaque)
     }
 }
 
-static int alsa_poll_helper (snd_pcm_t *handle, struct pollhlp *hlp)
+static int alsa_poll_helper (snd_pcm_t *handle, struct pollhlp *hlp, int mask)
 {
     int i, count, err;
     struct pollfd *pfds;
@@ -265,6 +266,7 @@ static int alsa_poll_helper (snd_pcm_t *handle, struct pollhlp *hlp)
     hlp->pfds = pfds;
     hlp->count = count;
     hlp->handle = handle;
+    hlp->mask = mask;
     return 0;
 }
 
@@ -272,14 +274,14 @@ static int alsa_poll_out (HWVoiceOut *hw)
 {
     ALSAVoiceOut *alsa = (ALSAVoiceOut *) hw;
 
-    return alsa_poll_helper (alsa->handle, &alsa->pollhlp);
+    return alsa_poll_helper (alsa->handle, &alsa->pollhlp, POLLOUT);
 }
 
 static int alsa_poll_in (HWVoiceIn *hw)
 {
     ALSAVoiceIn *alsa = (ALSAVoiceIn *) hw;
 
-    return alsa_poll_helper (alsa->handle, &alsa->pollhlp);
+    return alsa_poll_helper (alsa->handle, &alsa->pollhlp, POLLIN);
 }
 
 static int alsa_write (SWVoiceOut *sw, void *buf, int len)


[..snip..]

--
mailto:av1474@comtv.ru

[Qemu-devel] Re: Audio

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1023 bytes --]

malc wrote:
> The code was just commited that enables "polling" audio mode (oss and
> alsa), it's also unconditionally enabled now to obtain some testing
> coverage, so please give it a whirl, feedback is welcome.

CPU load goes to 100% when starting my Musicpal image. Applying the fix
below and disabling polling again cures this effect here.

Jan

--------->

audio: Fix typo that broke QEMU_AUDIO_ADC_TRY_POLL

From: Jan Kiszka <jan.kiszka@web.de>

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
---

 audio/audio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/audio/audio.c b/audio/audio.c
index e223cf3..d8e5496 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1607,7 +1607,7 @@ static struct audio_option audio_options[] = {
     {
         .name  = "ADC_TRY_POLL",
         .tag   = AUD_OPT_BOOL,
-        .valp  = &conf.try_poll_out,
+        .valp  = &conf.try_poll_in,
         .descr = "Attempt using poll mode for ADC"
     },
     /* Misc */


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

Re: [Qemu-devel] Re: Audio

[malc]

On Fri, 5 Nov 2004, Ronald wrote:

> Le Fri, 05 Nov 2004 21:47:23 +0300, malc a ?crit :
>
> > Hello,
> Hi,
>
> >
> > At http://www.boblycat.org/~malc/code/patches/qemu/ you will find latest
> > (11_aqemu) audio patch, which boosts following improvements:
> >
> > a. Optional OPL2 support (emulator uses floats and is disabled by default)
>
> Win32 build abort for adlib:
> /home/ronald/Prog/Win32/combo/qemu-win32/hw/adlib.c:219: conflicting types for `shutdown'
> /opt/mingw/i386-mingw32/sys-include/winsock2.h:531: previous declaration of `shutdown'
> make[1]: *** [adlib.o] Erreur 1
>
> winsock2 is included by windows.h
> Just need to rename shutdown function and the 4 calls to it.

Thank you for the report, patch has been updated to 11a_aqemu.

-- 
mailto:malc@pulsesoft.com

Re: [Qemu-devel] Re: Audio

[André Braga]

Won't declaring it 'static' work?

--
"A year spent in artificial intelligence is enough to make one believe in God"
Alan J. Perlis


On Fri, 05 Nov 2004 21:35:38 +0100, Ronald <look@reply.to> wrote:
> Win32 build abort for adlib:
> /home/ronald/Prog/Win32/combo/qemu-win32/hw/adlib.c:219: conflicting types for `shutdown'
> /opt/mingw/i386-mingw32/sys-include/winsock2.h:531: previous declaration of `shutdown'
> make[1]: *** [adlib.o] Erreur 1
> 
> winsock2 is included by windows.h
> Just need to rename shutdown function and the 4 calls to it.
>

[Qemu-devel] Re: Audio

[Ronald]

Le Fri, 05 Nov 2004 21:47:23 +0300, malc a écrit :

> Hello,
Hi,

> 
> At http://www.boblycat.org/~malc/code/patches/qemu/ you will find latest
> (11_aqemu) audio patch, which boosts following improvements:
> 
> a. Optional OPL2 support (emulator uses floats and is disabled by default)

Win32 build abort for adlib:
/home/ronald/Prog/Win32/combo/qemu-win32/hw/adlib.c:219: conflicting types for `shutdown'
/opt/mingw/i386-mingw32/sys-include/winsock2.h:531: previous declaration of `shutdown'
make[1]: *** [adlib.o] Erreur 1

winsock2 is included by windows.h
Just need to rename shutdown function and the 4 calls to it.