Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2196860/?format=api
{ "id": 2196860, "url": "http://patchwork.ozlabs.org/api/patches/2196860/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260216-audio-v1-81-e676662e4514@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260216-audio-v1-81-e676662e4514@redhat.com>", "list_archive_url": null, "date": "2026-02-16T11:16:10", "name": "[81/85] audio: rework audio_bug()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "ff39f62b59ea0613593ca4d05f04a50baba5247a", "submitter": { "id": 66774, "url": "http://patchwork.ozlabs.org/api/people/66774/?format=api", "name": "Marc-André Lureau", "email": "marcandre.lureau@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260216-audio-v1-81-e676662e4514@redhat.com/mbox/", "series": [ { "id": 492294, "url": "http://patchwork.ozlabs.org/api/series/492294/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=492294", "date": "2026-02-16T11:14:52", "name": "audio: cleanups & add a manual test", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/492294/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2196860/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2196860/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=WEgjcK5H;\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 4fF0qV62v7z1xxp\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 16 Feb 2026 22:27:18 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1vrwfm-0001Fn-OM; Mon, 16 Feb 2026 06:21:50 -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 <marcandre.lureau@redhat.com>)\n id 1vrwdc-0000za-5a\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:19:36 -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 <marcandre.lureau@redhat.com>)\n id 1vrwdZ-00006K-T1\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:19:35 -0500", "from mx-prod-mc-01.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-688-NFnMI7v4M2qG1oNPCa19nQ-1; Mon,\n 16 Feb 2026 06:19:29 -0500", "from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93])\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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 4065519560A7; Mon, 16 Feb 2026 11:19:27 +0000 (UTC)", "from localhost (unknown [10.45.242.26])\n by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id E991C1800668; Mon, 16 Feb 2026 11:19:25 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1771240772;\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=Ewz4+F8wLEtvaEcONlL4Y8tX4BoVoh7SgRY5ARaYuAk=;\n b=WEgjcK5Hsbw1wuJum+vlaXNcPNmHm5XIkh9ZwRrtOweREICuhTICnlJto37Vk8MVtcRTpZ\n Kf8oOuMIGe+ADCWQGz9Gp37rUwu578AQphW2DuhMl5LP+4HuVhvmda/AqqKmYR/OQiS27m\n Tn2UHaXBVS/9Eop5o4FFFtL8IOq2Q1c=", "X-MC-Unique": "NFnMI7v4M2qG1oNPCa19nQ-1", "X-Mimecast-MFC-AGG-ID": "NFnMI7v4M2qG1oNPCa19nQ_1771240767", "From": "=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>", "Date": "Mon, 16 Feb 2026 12:16:10 +0100", "Subject": "[PATCH 81/85] audio: rework audio_bug()", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "8bit", "Message-Id": "<20260216-audio-v1-81-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 <kraxel@redhat.com>, Eduardo Habkost <eduardo@habkost.net>,\n Paolo Bonzini <pbonzini@redhat.com>,\n =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= <berrange@redhat.com>, =?utf-8?q?Phil?=\n\t=?utf-8?q?ippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>,\n John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>,\n Christian Schoenebeck <qemu_oss@crudebyte.com>,\n Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>,\n Thomas Huth <huth@tuxfamily.org>, Alexandre Ratchov <alex@caoua.org>,\n\t=?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>,\n Laurent Vivier <laurent@vivier.eu>, \"Michael S. Tsirkin\" <mst@redhat.com>,\n Manos Pitsidianakis <manos.pitsidianakis@linaro.org>,\n Alistair Francis <alistair@alistair23.me>,\n \"Edgar E. Iglesias\" <edgar.iglesias@gmail.com>,\n Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org, =?utf-8?q?M?=\n\t=?utf-8?q?arc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>,\n Mark Cave-Ayland <mark.caveayland@nutanix.com>", "X-Developer-Signature": "v=1; a=openpgp-sha256; l=11037;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=/3V2T6+AVOssg4wHpZHYi8m0iDkSaDhsu7P35DaXrLk=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBpkvxSkgYNzhg230arsEiJ36msyQOTDWB/1rWp2\n jCud6Nb6SqJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaZL8UgAKCRDa6OEJdZac\n 5ZARD/4ng5KqzsGHx2AdN1Bn1SUQy3SQMGz031sYQKws8JP6i5rivPPufw0sjMHaUuws8zjBmJJ\n 4be9tI1HZqcH8MZrS7w2qaBbGsRPo9B2aYeIAC5BYRGbpmXwkyi1Ns/YylOSIvLoWQry2aHWYPE\n ftbl1RLU+fDVskVEGhrxk8sSKwRZRI0rNGvoXYKkXBNJp1zTDFuQSSGy66Gm2/JhCxJqx4krECa\n kfDyY7Xy0zvkjOEvH7huW6VCQHqwG9V1dph0RUvIbbd5tNZtcDp+gBUIVOIPydmGQJWez/eCV7H\n qvlROvh7Tr7WAASbPzNm0BWsrOT7QA0pVDRJUUwiJfJ2enwhRvh6XLfBMtdL6K+0AlGO+Ne+T82\n 8arzr/T+7IOHZmHuy5tY0ZHp1gS/dmM4SeGdaAEKYgWf7EjtEU6Xc1HT4APbzkSl/pq7Huz1t7n\n zMtt3E4Xvn+fRpcxnzIUDV+k6jkmNELA4aJsVsPp6P+FMBB/b4KAqZphssV9mZD+JqaqzaGPbqO\n Ghas7HORNNilgMzzK583KgqNxod9QXmjQfg/iKHTZj8mA7k4BCjlDUt4QFLWvM4Dxq/kw6b3ju2\n SxXEzYoyOh6/j6ihKbqPDAKTCs/mWHYjKKL7PMeVSlX9B5Ndu9l3fzEwqpqE+/+DxphMjH4ZV08\n 7yOZ06a2ngjYkoA==", "X-Developer-Key": "i=marcandre.lureau@redhat.com; a=openpgp;\n fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.93", "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=ham 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 <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "audio_bug() is a bit unconventional, it is meant to be used as a\ncondition expression, passing the actual condition as second argument\n(and __func__ as first argument).\n\nIf the condition is true, it uses AUD_log() to print to stderr, and has\nsome dubious recommendations printed only once.\n\nThis change:\n- clears the control flow, and make the condition directly visible in\n the 'if' statement.\n- uses standard QEMU error_report()\n- audio_bug() now captures __func__\n- remove the \"Save all your work and restart...\" once hint\n\nSigned-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>\nReviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>\n---\n audio/audio_int.h | 2 --\n audio/audio_template.h | 38 +++++++++++++--------------\n audio/audio-mixeng-be.c | 69 +++++++++++++++++++------------------------------\n 3 files changed, 46 insertions(+), 63 deletions(-)", "diff": "diff --git a/audio/audio_int.h b/audio/audio_int.h\nindex e0ed6af67ed..20ec7883aab 100644\n--- a/audio/audio_int.h\n+++ b/audio/audio_int.h\n@@ -244,8 +244,6 @@ extern const char *audio_prio_list[];\n void audio_pcm_init_info (struct audio_pcm_info *info, const struct audsettings *as);\n void audio_pcm_info_clear_buf (struct audio_pcm_info *info, void *buf, int len);\n \n-int audio_bug (const char *funcname, int cond);\n-\n void audio_run(AudioMixengBackend *s, const char *msg);\n \n typedef struct RateCtl {\ndiff --git a/audio/audio_template.h b/audio/audio_template.h\nindex 5711f4a26e1..9dde36738bc 100644\n--- a/audio/audio_template.h\n+++ b/audio/audio_template.h\n@@ -64,15 +64,15 @@ static void glue(audio_init_nb_voices_, TYPE)(AudioMixengBackend *s,\n min_voices);\n }\n \n- if (audio_bug(__func__, !voice_size && max_voices)) {\n- dolog(\"drv=`%s' voice_size=0 max_voices=%d\\n\",\n- k->name, max_voices);\n+ if (!voice_size && max_voices) {\n+ audio_bug(\"drv=`%s' voice_size=0 max_voices=%d\",\n+ k->name, max_voices);\n glue(s->nb_hw_voices_, TYPE) = 0;\n }\n \n- if (audio_bug(__func__, voice_size && !max_voices)) {\n- dolog(\"drv=`%s' voice_size=%zu max_voices=0\\n\",\n- k->name, voice_size);\n+ if (voice_size && !max_voices) {\n+ audio_bug(\"drv=`%s' voice_size=%zu max_voices=0\",\n+ k->name, voice_size);\n }\n }\n \n@@ -88,8 +88,8 @@ static void glue(audio_pcm_hw_alloc_resources_, TYPE)(HW *hw)\n {\n if (glue(audio_get_pdo_, TYPE)(hw->s->dev)->mixing_engine) {\n size_t samples = hw->samples;\n- if (audio_bug(__func__, samples == 0)) {\n- dolog(\"Attempted to allocate empty buffer\\n\");\n+ if (samples == 0) {\n+ audio_bug(\"Attempted to allocate empty buffer\");\n }\n \n HWBUF.buffer = g_new0(st_sample, samples);\n@@ -275,8 +275,8 @@ static HW *glue(audio_pcm_hw_add_new_, TYPE)(AudioMixengBackend *s,\n return NULL;\n }\n \n- if (audio_bug(__func__, !glue(k->init_, TYPE))) {\n- dolog(\"No host audio driver or missing init_%s\\n\", NAME);\n+ if (!glue(k->init_, TYPE)) {\n+ audio_bug(\"No host audio driver or missing init_%s\", NAME);\n return NULL;\n }\n \n@@ -295,8 +295,8 @@ static HW *glue(audio_pcm_hw_add_new_, TYPE)(AudioMixengBackend *s,\n goto err0;\n }\n \n- if (audio_bug(__func__, hw->samples <= 0)) {\n- dolog(\"hw->samples=%zd\\n\", hw->samples);\n+ if (hw->samples <= 0) {\n+ audio_bug(\"hw->samples=%zd\", hw->samples);\n goto err1;\n }\n \n@@ -477,8 +477,8 @@ static void glue (audio_close_, TYPE) (SW *sw)\n static void glue(audio_mixeng_backend_close_, TYPE)(AudioBackend *be, SW *sw)\n {\n if (sw) {\n- if (audio_bug(__func__, !be)) {\n- dolog(\"backend=%p\\n\", be);\n+ if (!be) {\n+ audio_bug(\"backend=%p\", be);\n return;\n }\n \n@@ -498,9 +498,9 @@ static SW *glue(audio_mixeng_backend_open_, TYPE) (\n AudioMixengBackendClass *k;\n AudiodevPerDirectionOptions *pdo;\n \n- if (audio_bug(__func__, !be || !name || !callback_fn || !as)) {\n- dolog(\"backend=%p name=%p callback_fn=%p as=%p\\n\",\n- be, name, callback_fn, as);\n+ if (!be || !name || !callback_fn || !as) {\n+ audio_bug(\"backend=%p name=%p callback_fn=%p as=%p\",\n+ be, name, callback_fn, as);\n goto fail;\n }\n \n@@ -519,8 +519,8 @@ static SW *glue(audio_mixeng_backend_open_, TYPE) (\n goto fail;\n }\n \n- if (audio_bug(__func__, !glue(k->init_, TYPE))) {\n- dolog(\"Can not open `%s' (no host audio driver)\\n\", name);\n+ if (!glue(k->init_, TYPE)) {\n+ error_report(\"audio: Can not open `%s' (no host audio driver)\", name);\n goto fail;\n }\n \ndiff --git a/audio/audio-mixeng-be.c b/audio/audio-mixeng-be.c\nindex bb8c0b56f78..45bcfb74338 100644\n--- a/audio/audio-mixeng-be.c\n+++ b/audio/audio-mixeng-be.c\n@@ -31,6 +31,8 @@\n \n #define SW_NAME(sw) (sw)->name ? (sw)->name : \"unknown\"\n \n+#define audio_bug(fmt, ...) error_report(\"%s: \" fmt, __func__, ##__VA_ARGS__)\n+\n const struct mixeng_volume nominal_volume = {\n .mute = 0,\n #ifdef FLOAT_MIXENG\n@@ -42,23 +44,6 @@ const struct mixeng_volume nominal_volume = {\n #endif\n };\n \n-int audio_bug (const char *funcname, int cond)\n-{\n- if (cond) {\n- static int shown;\n-\n- AUD_log (NULL, \"A bug was just triggered in %s\\n\", funcname);\n- if (!shown) {\n- shown = 1;\n- AUD_log (NULL, \"Save all your work and restart without audio\\n\");\n- AUD_log (NULL, \"I am sorry\\n\");\n- }\n- AUD_log (NULL, \"Context:\\n\");\n- }\n-\n- return cond;\n-}\n-\n /*\n * Convert audio format to mixeng_clip index. Used by audio_pcm_sw_init_ and\n * audio_mixeng_backend_add_capture()\n@@ -332,8 +317,8 @@ static size_t audio_pcm_hw_find_min_in (HWVoiceIn *hw)\n static size_t audio_pcm_hw_get_live_in(HWVoiceIn *hw)\n {\n size_t live = hw->total_samples_captured - audio_pcm_hw_find_min_in (hw);\n- if (audio_bug(__func__, live > hw->conv_buf.size)) {\n- dolog(\"live=%zu hw->conv_buf.size=%zu\\n\", live, hw->conv_buf.size);\n+ if (live > hw->conv_buf.size) {\n+ audio_bug(\"live=%zu hw->conv_buf.size=%zu\", live, hw->conv_buf.size);\n return 0;\n }\n return live;\n@@ -402,8 +387,8 @@ static size_t audio_pcm_sw_read(SWVoiceIn *sw, void *buf, size_t buf_len)\n if (!live) {\n return 0;\n }\n- if (audio_bug(__func__, live > hw->conv_buf.size)) {\n- dolog(\"live_in=%zu hw->conv_buf.size=%zu\\n\", live, hw->conv_buf.size);\n+ if (live > hw->conv_buf.size) {\n+ audio_bug(\"live=%zu hw->conv_buf.size=%zu\", live, hw->conv_buf.size);\n return 0;\n }\n \n@@ -454,8 +439,8 @@ static size_t audio_pcm_hw_get_live_out (HWVoiceOut *hw, int *nb_live)\n if (nb_live1) {\n size_t live = smin;\n \n- if (audio_bug(__func__, live > hw->mix_buf.size)) {\n- dolog(\"live=%zu hw->mix_buf.size=%zu\\n\", live, hw->mix_buf.size);\n+ if (live > hw->mix_buf.size) {\n+ audio_bug(\"live=%zu hw->mix_buf.size=%zu\", live, hw->mix_buf.size);\n return 0;\n }\n return live;\n@@ -533,8 +518,8 @@ static size_t audio_pcm_sw_write(SWVoiceOut *sw, void *buf, size_t buf_len)\n size_t frames_in_max, frames_out_max, total_in, total_out;\n \n live = sw->total_hw_samples_mixed;\n- if (audio_bug(__func__, live > hw->mix_buf.size)) {\n- dolog(\"live=%zu hw->mix_buf.size=%zu\\n\", live, hw->mix_buf.size);\n+ if (live > hw->mix_buf.size) {\n+ audio_bug(\"live=%zu hw->mix_buf.size=%zu\", live, hw->mix_buf.size);\n return 0;\n }\n \n@@ -824,9 +809,9 @@ static size_t audio_get_avail(SWVoiceIn *sw)\n }\n \n live = sw->hw->total_samples_captured - sw->total_hw_samples_acquired;\n- if (audio_bug(__func__, live > sw->hw->conv_buf.size)) {\n- dolog(\"live=%zu sw->hw->conv_buf.size=%zu\\n\", live,\n- sw->hw->conv_buf.size);\n+ if (live > sw->hw->conv_buf.size) {\n+ audio_bug(\"live=%zu sw->hw->conv_buf.size=%zu\", live,\n+ sw->hw->conv_buf.size);\n return 0;\n }\n \n@@ -845,9 +830,9 @@ static size_t audio_get_free(SWVoiceOut *sw)\n \n live = sw->total_hw_samples_mixed;\n \n- if (audio_bug(__func__, live > sw->hw->mix_buf.size)) {\n- dolog(\"live=%zu sw->hw->mix_buf.size=%zu\\n\", live,\n- sw->hw->mix_buf.size);\n+ if (live > sw->hw->mix_buf.size) {\n+ audio_bug(\"live=%zu sw->hw->mix_buf.size=%zu\", live,\n+ sw->hw->mix_buf.size);\n return 0;\n }\n \n@@ -1002,8 +987,8 @@ static void audio_run_out(AudioMixengBackend *s)\n live = 0;\n }\n \n- if (audio_bug(__func__, live > hw->mix_buf.size)) {\n- dolog(\"live=%zu hw->mix_buf.size=%zu\\n\", live, hw->mix_buf.size);\n+ if (live > hw->mix_buf.size) {\n+ audio_bug(\"live=%zu hw->mix_buf.size=%zu\", live, hw->mix_buf.size);\n continue;\n }\n \n@@ -1033,9 +1018,9 @@ static void audio_run_out(AudioMixengBackend *s)\n prev_rpos = hw->mix_buf.pos;\n played = audio_pcm_hw_run_out(hw, live);\n replay_audio_out(&played);\n- if (audio_bug(__func__, hw->mix_buf.pos >= hw->mix_buf.size)) {\n- dolog(\"hw->mix_buf.pos=%zu hw->mix_buf.size=%zu played=%zu\\n\",\n- hw->mix_buf.pos, hw->mix_buf.size, played);\n+ if (hw->mix_buf.pos >= hw->mix_buf.size) {\n+ audio_bug(\"hw->mix_buf.pos=%zu hw->mix_buf.size=%zu played=%zu\",\n+ hw->mix_buf.pos, hw->mix_buf.size, played);\n hw->mix_buf.pos = 0;\n }\n \n@@ -1050,9 +1035,9 @@ static void audio_run_out(AudioMixengBackend *s)\n continue;\n }\n \n- if (audio_bug(__func__, played > sw->total_hw_samples_mixed)) {\n- dolog(\"played=%zu sw->total_hw_samples_mixed=%zu\\n\",\n- played, sw->total_hw_samples_mixed);\n+ if (played > sw->total_hw_samples_mixed) {\n+ audio_bug(\"played=%zu sw->total_hw_samples_mixed=%zu\",\n+ played, sw->total_hw_samples_mixed);\n played = sw->total_hw_samples_mixed;\n }\n \n@@ -1195,9 +1180,9 @@ static void audio_run_capture(AudioMixengBackend *s)\n continue;\n }\n \n- if (audio_bug(__func__, captured > sw->total_hw_samples_mixed)) {\n- dolog(\"captured=%zu sw->total_hw_samples_mixed=%zu\\n\",\n- captured, sw->total_hw_samples_mixed);\n+ if (captured > sw->total_hw_samples_mixed) {\n+ audio_bug(\"captured=%zu sw->total_hw_samples_mixed=%zu\",\n+ captured, sw->total_hw_samples_mixed);\n captured = sw->total_hw_samples_mixed;\n }\n \n", "prefixes": [ "81/85" ] }