diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2011-10-25 16:53:00 +0200 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2011-10-25 19:15:07 +0400 |
| commit | 36ac4ad3d054a7b4962a6393630a73591cfa9558 (patch) | |
| tree | fbdf25dc35489ecce023bf8e3537d622f89147f9 /hw | |
| parent | 952e849c150b4f1b89f8728cba00f925c1d6e75b (diff) | |
| download | qemu-36ac4ad3d054a7b4962a6393630a73591cfa9558.tar.gz qemu-36ac4ad3d054a7b4962a6393630a73591cfa9558.tar.bz2 qemu-36ac4ad3d054a7b4962a6393630a73591cfa9558.zip | |
hda: do not mix output and input streams, RHBZ #740493
Windows 7 may use the same stream number for input and output.
That will result in lot of garbage on playback.
The hardcoded value of 4 needs to be in sync with GCAP streams
description and IN/OUT registers.
Signed-off-by: Marc-Andr? Lureau <marcandre.lureau@redhat.com>
Signed-off-by: malc <av1474@comtv.ru>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/intel-hda.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/intel-hda.c b/hw/intel-hda.c index 4272204e03..c6a3fecb57 100644 --- a/hw/intel-hda.c +++ b/hw/intel-hda.c @@ -389,14 +389,15 @@ static bool intel_hda_xfer(HDACodecDevice *dev, uint32_t stnr, bool output, { HDACodecBus *bus = DO_UPCAST(HDACodecBus, qbus, dev->qdev.parent_bus); IntelHDAState *d = container_of(bus, IntelHDAState, codecs); - IntelHDAStream *st = NULL; target_phys_addr_t addr; uint32_t s, copy, left; + IntelHDAStream *st; bool irq = false; - for (s = 0; s < ARRAY_SIZE(d->st); s++) { - if (stnr == ((d->st[s].ctl >> 20) & 0x0f)) { - st = d->st + s; + st = output ? d->st + 4 : d->st; + for (s = 0; s < 4; s++) { + if (stnr == ((st[s].ctl >> 20) & 0x0f)) { + st = st + s; break; } } |