{"id":2196815,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2196815/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260216-audio-v1-33-e676662e4514@redhat.com>","date":"2026-02-16T11:15:22","name":"[33/85] replay: remove dependency on audio/","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a1409af24f3d4e399f2faa31168c9142ac182dfa","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/1.0/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260216-audio-v1-33-e676662e4514@redhat.com/mbox/","series":[{"id":492294,"url":"http://patchwork.ozlabs.org/api/1.0/series/492294/?format=json","date":"2026-02-16T11:14:52","name":"audio: cleanups & add a manual test","version":1,"mbox":"http://patchwork.ozlabs.org/series/492294/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2196815/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=EUnqt2B7;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fF0hq3n41z1xpY\n\tfor ; Mon, 16 Feb 2026 22:21:31 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1vrweB-0002H2-MI; Mon, 16 Feb 2026 06:20:11 -0500","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1vrwbT-0005fC-6a\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:17:27 -0500","from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1vrwbM-0007pb-Ir\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:17:20 -0500","from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-640-8t5AbWi2OoWD2baAfHEgnw-1; Mon,\n 16 Feb 2026 06:17:12 -0500","from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 7643B1956061; Mon, 16 Feb 2026 11:17:10 +0000 (UTC)","from localhost (unknown [10.45.242.26])\n by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id E696719560A2; Mon, 16 Feb 2026 11:17:08 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1771240633;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=3xeWvMvqtuFhrWKD3XFf59Ut7UelIyxTytDe1bEinLs=;\n b=EUnqt2B7zgPG+0HrUPXCbiadHTnmppL3vYhTIohB9XEmm0nLNdAanh7Dth3twuuqqfQvfX\n JOLzaLb2x0NcDA2IuLPkcWDhRNwmqWfGovWnrE+I2AarvAQdQTRArZkxfBNg7/WsqcGRNp\n GcFaWedIAaW67t8o+cGqQOY5p0uJfzU=","X-MC-Unique":"8t5AbWi2OoWD2baAfHEgnw-1","X-Mimecast-MFC-AGG-ID":"8t5AbWi2OoWD2baAfHEgnw_1771240630","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Date":"Mon, 16 Feb 2026 12:15:22 +0100","Subject":"[PATCH 33/85] replay: remove dependency on audio/","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"8bit","Message-Id":"<20260216-audio-v1-33-e676662e4514@redhat.com>","References":"<20260216-audio-v1-0-e676662e4514@redhat.com>","In-Reply-To":"<20260216-audio-v1-0-e676662e4514@redhat.com>","To":"qemu-devel@nongnu.org","Cc":"Gerd Hoffmann , Eduardo Habkost ,\n Paolo Bonzini ,\n =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Phil?=\n\t=?utf-8?q?ippe_Mathieu-Daud=C3=A9?= ,\n John Snow , Cleber Rosa ,\n Christian Schoenebeck ,\n Akihiko Odaki ,\n Thomas Huth , Alexandre Ratchov ,\n\t=?utf-8?q?Alex_Benn=C3=A9e?= ,\n Laurent Vivier , \"Michael S. Tsirkin\" ,\n Manos Pitsidianakis ,\n Alistair Francis ,\n \"Edgar E. Iglesias\" ,\n Peter Maydell , qemu-arm@nongnu.org, =?utf-8?q?M?=\n\t=?utf-8?q?arc-Andr=C3=A9_Lureau?= ","X-Developer-Signature":"v=1; a=openpgp-sha256; l=10064;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=yYN0P5+55ydAfUsgTwVah+g7J0MKZlpuHaNWhwjdvxc=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBpkvxPkSir1VCgrDwANDcB3W/10y+GU5RHkdawC\n 9KiXszkRCKJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaZL8TwAKCRDa6OEJdZac\n 5e9sEACFTWvfUH2QNSKpxj1c/AV90HkIuaB7JEDE65qMyanr+kH7TFsWu9yNaemcnnAHz1tnqnc\n sMDe6CRuKBOabLT0hrOsoSZV1++9sUsnTtqtEhkxH+ui7xMb/TIM6FPmJe/zClXnrDNP2x0LL2R\n tL14pLnkvZisn77R6zxfeBWyd3fFmcFe5wuMWXpOvPc1BygBC3wyzBbX5pxpPIraZtHQS56QdwP\n c42JxVP2SlV/QBEd12Ypzuo30VIWU+JEgaRKjZAJc8BT0+/p9NP07o0tGUuy3grKr6qspQkZT25\n kXNjeOm32NDJ7yk21GpYssZPZVoNFwF3SVaK+7YliDWLBUJHtqhgxeNkoUwobhrkLFtLqL1rTCz\n ayKWzXdVm3pHtnn4SzjEUyOZCYQ0s2+nYnv9Ssz1HPWCXSe1mh0bEPWe074BZPzRSBJ0RDhMaOl\n dLW3GlZ3DwQL+hUAC4/M+WbF+jqT9Q1evDT9WfdB0ztwVL6s/pWQmoLACNRu3zwlLtEhRT029wv\n S+qIawFUdYgTdO1Aia2D+8DR8HqALEyoBC6H/T5TFg4gLZEb9vgHuXQZcI10OI4Uf75OclL1b1l\n 1GXuUcRt0koWhC49bkcYbuQtq9oAPiJJoWkixdLUPkdNtwDKq64mNl63lshlRgDdV8PoI8Wv8/E\n ynDBhNDRcxPVkCw==","X-Developer-Key":"i=marcandre.lureau@redhat.com; a=openpgp;\n fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.12","Received-SPF":"pass client-ip=170.10.133.124;\n envelope-from=marcandre.lureau@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,\n RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001,\n SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"The replay infrastructure shouldn't depend on internals of audio/.\n(st_sample is an internal implementation detail and could be different)\n\nLet audio drive the audio samples recording/replaying.\n\nNotice also we don't need to save & restore the internal ring \"wpos\",\nall replay should care about is the number of samples and the samples.\n\nBump the replay version.\n\nSigned-off-by: Marc-André Lureau \n---\n audio/audio_int.h | 5 +++++\n include/qemu/audio.h | 5 -----\n include/system/replay.h | 11 ++++++++--\n replay/replay-internal.h | 2 ++\n audio/audio.c | 23 +++++++++++++++++++--\n replay/replay-audio.c | 51 ++++++++++++++++++++++++++++-------------------\n replay/replay.c | 2 +-\n replay/stubs-system.c | 8 +++++++-\n tests/audio/audio-stubs.c | 13 +++++++++---\n 9 files changed, 85 insertions(+), 35 deletions(-)","diff":"diff --git a/audio/audio_int.h b/audio/audio_int.h\nindex e1f9fa333ba..250fd45238d 100644\n--- a/audio/audio_int.h\n+++ b/audio/audio_int.h\n@@ -309,6 +309,11 @@ static inline size_t audio_ring_posb(size_t pos, size_t dist, size_t len)\n AudiodevPerDirectionOptions *audio_get_pdo_in(Audiodev *dev);\n AudiodevPerDirectionOptions *audio_get_pdo_out(Audiodev *dev);\n \n+void audio_sample_to_uint64(const st_sample *sample, int pos,\n+ uint64_t *left, uint64_t *right);\n+void audio_sample_from_uint64(st_sample *sample, int pos,\n+ uint64_t left, uint64_t right);\n+\n #define TYPE_AUDIO_MIXENG_BACKEND \"audio-mixeng-backend\"\n OBJECT_DECLARE_TYPE(AudioMixengBackend, AudioMixengBackendClass, AUDIO_MIXENG_BACKEND)\n \ndiff --git a/include/qemu/audio.h b/include/qemu/audio.h\nindex 1eeead2a722..03ce9adbc88 100644\n--- a/include/qemu/audio.h\n+++ b/include/qemu/audio.h\n@@ -120,11 +120,6 @@ void audio_cleanup(void);\n \n typedef struct st_sample st_sample;\n \n-void audio_sample_to_uint64(const st_sample *sample, int pos,\n- uint64_t *left, uint64_t *right);\n-void audio_sample_from_uint64(st_sample *sample, int pos,\n- uint64_t left, uint64_t right);\n-\n void audio_add_audiodev(Audiodev *audio);\n void audio_add_default_audiodev(Audiodev *dev, Error **errp);\n void audio_parse_option(const char *opt);\ndiff --git a/include/system/replay.h b/include/system/replay.h\nindex f8715ca9feb..19fb6dbb396 100644\n--- a/include/system/replay.h\n+++ b/include/system/replay.h\n@@ -165,8 +165,15 @@ void replay_net_packet_event(ReplayNetState *rns, unsigned flags,\n \n /*! Saves/restores number of played samples of audio out operation. */\n void replay_audio_out(size_t *played);\n-/*! Saves/restores recorded samples of audio in operation. */\n-void replay_audio_in(size_t *recorded, st_sample *samples, size_t *wpos, size_t size);\n+/*\n+ * Start saves/restores recorded samples of audio in operation.\n+ * Must be called before replay_audio_in_sample_lr().\n+ */\n+void replay_audio_in_start(size_t *recorded);\n+/* Saves/restores recorded samples. */\n+void replay_audio_in_sample_lr(uint64_t *left, uint64_t *right);\n+/* Finish saves/restores recorded samples. */\n+void replay_audio_in_finish(void);\n \n /* VM state operations */\n \ndiff --git a/replay/replay-internal.h b/replay/replay-internal.h\nindex 75249b76936..643b357da12 100644\n--- a/replay/replay-internal.h\n+++ b/replay/replay-internal.h\n@@ -85,6 +85,7 @@ enum ReplayEvents {\n * @file_offset: offset into replay log at replay snapshot\n * @block_request_id: current serialised block request id\n * @read_event_id: current async read event id\n+ * @n_audio_samples: expected audio samples\n */\n typedef struct ReplayState {\n int64_t cached_clock[REPLAY_CLOCK_COUNT];\n@@ -96,6 +97,7 @@ typedef struct ReplayState {\n uint64_t file_offset;\n uint64_t block_request_id;\n uint64_t read_event_id;\n+ size_t n_audio_samples;\n } ReplayState;\n extern ReplayState replay_state;\n \ndiff --git a/audio/audio.c b/audio/audio.c\nindex 1fa63ee0421..3e16b719399 100644\n--- a/audio/audio.c\n+++ b/audio/audio.c\n@@ -1301,13 +1301,32 @@ static void audio_run_in(AudioMixengBackend *s)\n while ((hw = audio_pcm_hw_find_any_enabled_in(s, hw))) {\n SWVoiceIn *sw;\n size_t captured = 0, min;\n+ int pos;\n \n if (replay_mode != REPLAY_MODE_PLAY) {\n captured = audio_pcm_hw_run_in(\n hw, hw->conv_buf.size - audio_pcm_hw_get_live_in(hw));\n }\n- replay_audio_in(&captured, hw->conv_buf.buffer, &hw->conv_buf.pos,\n- hw->conv_buf.size);\n+\n+ replay_audio_in_start(&captured);\n+ assert(captured <= hw->conv_buf.size);\n+ if (replay_mode == REPLAY_MODE_PLAY) {\n+ hw->conv_buf.pos = (hw->conv_buf.pos + captured) % hw->conv_buf.size;\n+ }\n+ for (pos = (hw->conv_buf.pos - captured + hw->conv_buf.size) % hw->conv_buf.size;\n+ pos != hw->conv_buf.pos;\n+ pos = (pos + 1) % hw->conv_buf.size) {\n+ uint64_t left, right;\n+\n+ if (replay_mode == REPLAY_MODE_RECORD) {\n+ audio_sample_to_uint64(hw->conv_buf.buffer, pos, &left, &right);\n+ }\n+ replay_audio_in_sample_lr(&left, &right);\n+ if (replay_mode == REPLAY_MODE_PLAY) {\n+ audio_sample_from_uint64(hw->conv_buf.buffer, pos, left, right);\n+ }\n+ }\n+ replay_audio_in_finish();\n \n min = audio_pcm_hw_find_min_in (hw);\n hw->total_samples_captured += captured - min;\ndiff --git a/replay/replay-audio.c b/replay/replay-audio.c\nindex 1b614f41379..7d20ae9110c 100644\n--- a/replay/replay-audio.c\n+++ b/replay/replay-audio.c\n@@ -13,7 +13,6 @@\n #include \"qemu/error-report.h\"\n #include \"system/replay.h\"\n #include \"replay-internal.h\"\n-#include \"qemu/audio.h\"\n \n void replay_audio_out(size_t *played)\n {\n@@ -35,38 +34,48 @@ void replay_audio_out(size_t *played)\n }\n }\n \n-void replay_audio_in(size_t *recorded, st_sample *samples, size_t *wpos, size_t size)\n+void replay_audio_in_start(size_t *nsamples)\n {\n- int pos;\n- uint64_t left, right;\n if (replay_mode == REPLAY_MODE_RECORD) {\n g_assert(replay_mutex_locked());\n replay_save_instructions();\n replay_put_event(EVENT_AUDIO_IN);\n- replay_put_qword(*recorded);\n- replay_put_qword(*wpos);\n- for (pos = (*wpos - *recorded + size) % size ; pos != *wpos\n- ; pos = (pos + 1) % size) {\n- audio_sample_to_uint64(samples, pos, &left, &right);\n- replay_put_qword(left);\n- replay_put_qword(right);\n- }\n+ replay_put_qword(*nsamples);\n+ replay_state.n_audio_samples = *nsamples;\n } else if (replay_mode == REPLAY_MODE_PLAY) {\n g_assert(replay_mutex_locked());\n replay_account_executed_instructions();\n if (replay_next_event_is(EVENT_AUDIO_IN)) {\n- *recorded = replay_get_qword();\n- *wpos = replay_get_qword();\n- for (pos = (*wpos - *recorded + size) % size ; pos != *wpos\n- ; pos = (pos + 1) % size) {\n- left = replay_get_qword();\n- right = replay_get_qword();\n- audio_sample_from_uint64(samples, pos, left, right);\n- }\n- replay_finish_event();\n+ *nsamples = replay_get_qword();\n+ replay_state.n_audio_samples = *nsamples;\n } else {\n error_report(\"Missing audio in event in the replay log\");\n abort();\n }\n }\n }\n+\n+void replay_audio_in_sample_lr(uint64_t *left, uint64_t *right)\n+{\n+ if (replay_mode == REPLAY_MODE_RECORD) {\n+ replay_put_qword(*left);\n+ replay_put_qword(*right);\n+ } else if (replay_mode == REPLAY_MODE_PLAY) {\n+ *left = replay_get_qword();\n+ *right = replay_get_qword();\n+ } else {\n+ return;\n+ }\n+\n+ assert(replay_state.n_audio_samples > 0);\n+ replay_state.n_audio_samples--;\n+}\n+\n+void replay_audio_in_finish(void)\n+{\n+ assert(replay_state.n_audio_samples == 0);\n+\n+ if (replay_mode == REPLAY_MODE_PLAY) {\n+ replay_finish_event();\n+ }\n+}\ndiff --git a/replay/replay.c b/replay/replay.c\nindex b2121788c1d..2e5c6fa82ea 100644\n--- a/replay/replay.c\n+++ b/replay/replay.c\n@@ -22,7 +22,7 @@\n \n /* Current version of the replay mechanism.\n Increase it when file format changes. */\n-#define REPLAY_VERSION 0xe0200c\n+#define REPLAY_VERSION 0xe0200d\n /* Size of replay log header */\n #define HEADER_SIZE (sizeof(uint32_t) + sizeof(uint64_t))\n \ndiff --git a/replay/stubs-system.c b/replay/stubs-system.c\nindex 7f85764936f..b2c52bc4043 100644\n--- a/replay/stubs-system.c\n+++ b/replay/stubs-system.c\n@@ -15,7 +15,13 @@ void replay_input_sync_event(void)\n void replay_add_blocker(const char *feature)\n {\n }\n-void replay_audio_in(size_t *recorded, st_sample *samples, size_t *wpos, size_t size)\n+void replay_audio_in_start(size_t *nsamples)\n+{\n+}\n+void replay_audio_in_sample_lr(uint64_t *left, uint64_t *right)\n+{\n+}\n+void replay_audio_in_finish(void)\n {\n }\n void replay_audio_out(size_t *played)\ndiff --git a/tests/audio/audio-stubs.c b/tests/audio/audio-stubs.c\nindex dd7f635d460..2c19dfa7d6b 100644\n--- a/tests/audio/audio-stubs.c\n+++ b/tests/audio/audio-stubs.c\n@@ -35,12 +35,19 @@ dbus_win32_import_socket(GDBusMethodInvocation *invocation,\n }\n #endif\n \n-void replay_audio_in(size_t *recorded, st_sample *samples,\n- size_t *wpos, size_t size)\n+void replay_audio_out(size_t *played)\n {\n }\n \n-void replay_audio_out(size_t *played)\n+void replay_audio_in_start(size_t *nsamples)\n+{\n+}\n+\n+void replay_audio_in_sample_lr(uint64_t *left, uint64_t *right)\n+{\n+}\n+\n+void replay_audio_in_finish(void)\n {\n }\n \n","prefixes":["33/85"]}