On Mon, 23 Feb 2026 at 09:46, <[email protected]> wrote:
>
> From: Marc-André Lureau <[email protected]>
>
> The following changes since commit 07f97d5da04a9f97e273de85c76f5017d8135a6e:
>
> Merge tag 'pull-target-arm-20260219' of https://gitlab.com/pm215/qemu into
> staging (2026-02-19 10:36:06 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/marcandre.lureau/qemu.git tags/audio-pull-request
>
> for you to fetch changes up to 8699fab503fb06ecb8ea21ec1af99d85f28b4508:
>
> audio: fix leak of audio capture name (2026-02-22 13:54:40 +0100)
>
> ----------------------------------------------------------------
> audio cleanups
>
Hi -- this has a conflict on merge:
diff --cc hw/audio/virtio-snd.c
index d5d430ad65,8b94914646..0000000000
--- a/hw/audio/virtio-snd.c
+++ b/hw/audio/virtio-snd.c
@@@ -1276,12 -1259,11 +1277,20 @@@ static void virtio_snd_pcm_in_cb(void *
return_rx_buffer(stream, buffer);
break;
}
++<<<<<<< HEAD
+ to_read = stream->params.period_bytes - buffer->size;
+ to_read = MIN(to_read, available);
+ to_read = MIN(to_read, max_size - buffer->size);
+ size = AUD_read(stream->voice.in,
+ buffer->data + buffer->size,
+ to_read);
++=======
+ size = audio_be_read(stream->s->audio_be,
+ stream->voice.in,
+ buffer->data + buffer->size,
+ MIN(available, (stream->params.period_bytes -
+ buffer->size)));
++>>>>>>> 42769ad0c1871228f1f4ee3d2bf41ed71389df01
if (!size) {
available = 0;
break;
Could you fix up and resend, please?
thanks
-- PMM
