[Qemu-devel] [PULL 0/2] Audio 20190110 patches

[Qemu-devel] [PULL 0/2] Audio 20190110 patches

[Gerd Hoffmann]

The following changes since commit e59dbbac0364344a3ad84c3497a98c56003d3fb8:

  Merge remote-tracking branch 'remotes/philmd/tags/fw_cfg-20190104-pull-request' into staging (2019-01-04 18:23:13 +0000)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/audio-20190110-pull-request

for you to fetch changes up to a7fde1c1706a93c304eb301cc290d71c9426493b:

  usb-audio: ignore usb packages with wrong size (2019-01-10 09:56:19 +0100)

----------------------------------------------------------------
audio: two fixes.

----------------------------------------------------------------

Gerd Hoffmann (1):
  usb-audio: ignore usb packages with wrong size

Thomas Huth (1):
  hw/audio/marvell: Don't include unnecessary i2c.h header file

 hw/audio/marvell_88w8618.c | 1 -
 hw/usb/dev-audio.c         | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

-- 
2.9.3

[Qemu-devel] [PULL 1/2] hw/audio/marvell: Don't include unnecessary i2c.h header file

[Gerd Hoffmann]

From: Thomas Huth <thuth@redhat.com>

This device does not use I2C, so no need to include the header file here.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1546614146-10525-1-git-send-email-thuth@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/audio/marvell_88w8618.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c
index 6600ab4851..035dd76cbf 100644
--- a/hw/audio/marvell_88w8618.c
+++ b/hw/audio/marvell_88w8618.c
@@ -12,7 +12,6 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
-#include "hw/i2c/i2c.h"
 #include "hw/audio/wm8750.h"
 #include "audio/audio.h"
 #include "qapi/error.h"
-- 
2.9.3

[Qemu-devel] [PULL 2/2] usb-audio: ignore usb packages with wrong size

[Gerd Hoffmann]

usb packets with no payload (zero length) seem to happen in practice for
whatever reason.  Add a check and skip the packet then, otherwise we'll
trigger an assert.

Reported-by: Leonardo Soares Müller <leozinho29_eu@hotmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20181211072649.20700-1-kraxel@redhat.com
---
 hw/usb/dev-audio.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index ee43e4914d..28ac7c5165 100644
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -321,6 +321,9 @@ static int streambuf_put(struct streambuf *buf, USBPacket *p)
     if (!free) {
         return 0;
     }
+    if (p->iov.size != USBAUDIO_PACKET_SIZE) {
+        return 0;
+    }
     assert(free >= USBAUDIO_PACKET_SIZE);
     usb_packet_copy(p, buf->data + (buf->prod % buf->size),
                     USBAUDIO_PACKET_SIZE);
-- 
2.9.3

Re: [Qemu-devel] [PULL 0/2] Audio 20190110 patches

[Peter Maydell]

On Thu, 10 Jan 2019 at 09:25, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit e59dbbac0364344a3ad84c3497a98c56003d3fb8:
>
>   Merge remote-tracking branch 'remotes/philmd/tags/fw_cfg-20190104-pull-request' into staging (2019-01-04 18:23:13 +0000)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/audio-20190110-pull-request
>
> for you to fetch changes up to a7fde1c1706a93c304eb301cc290d71c9426493b:
>
>   usb-audio: ignore usb packages with wrong size (2019-01-10 09:56:19 +0100)
>
> ----------------------------------------------------------------
> audio: two fixes.
>
> ----------------------------------------------------------------
>
> Gerd Hoffmann (1):
>   usb-audio: ignore usb packages with wrong size
>
> Thomas Huth (1):
>   hw/audio/marvell: Don't include unnecessary i2c.h header file

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
for any user-visible changes.

-- PMM