{"id":2196863,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2196863/?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-59-e676662e4514@redhat.com>","date":"2026-02-16T11:15:48","name":"[59/85] audio/alsa: replace custom logging with error_report and trace events","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"0c837e872a7b1ed8edae23104d3a0c0aab743f0c","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-59-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/2196863/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=Wg1Vdv1E;\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 4fF0qd4Rb6z1xxp\n\tfor ; Mon, 16 Feb 2026 22:27:25 +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 1vrwfa-0008Ms-H1; Mon, 16 Feb 2026 06:21:38 -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 1vrwcc-0006ry-PT\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:18:37 -0500","from us-smtp-delivery-124.mimecast.com ([170.10.129.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 1vrwcY-0008Fi-Gt\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:18:34 -0500","from mx-prod-mc-05.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-649-q2zDzTkyPTu0ssSat28GlQ-1; Mon,\n 16 Feb 2026 06:18:27 -0500","from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17])\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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 9A1901955D8F; Mon, 16 Feb 2026 11:18:25 +0000 (UTC)","from localhost (unknown [10.45.242.26])\n by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 305A91955F43; Mon, 16 Feb 2026 11:18:23 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1771240708;\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=eKkFMj950lDAUV4S1UFcLP4VDur4HUuRrCzi2Gmkt2k=;\n b=Wg1Vdv1ECU/bV5PA+lUaMU86r9BjJczzfLGN/naVOqY2xv6M9UiNCMOeAlRly1dCsjvfgb\n 4prE1skTiau21qrA2kvsrWfePZklLlfGvTmaIFoqOps0DLqYdrePRsdYEUm+o+vB7UMt+L\n mTn8BhOOQnrQf0McdUZTdKLAQUGVndQ=","X-MC-Unique":"q2zDzTkyPTu0ssSat28GlQ-1","X-Mimecast-MFC-AGG-ID":"q2zDzTkyPTu0ssSat28GlQ_1771240705","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Date":"Mon, 16 Feb 2026 12:15:48 +0100","Subject":"[PATCH 59/85] audio/alsa: replace custom logging with error_report\n and trace events","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"8bit","Message-Id":"<20260216-audio-v1-59-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?= ,\n Mark Cave-Ayland ","X-Developer-Signature":"v=1; a=openpgp-sha256; l=19789;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=CAWta9RWTinKoQTsIDLzifGCwuI25Ws2ra0+hdwsKPc=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBpkvxRy8HcvjIeoq6uibfYD0ekYfoi0Ybhg9tA2\n oEup69+mFaJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaZL8UQAKCRDa6OEJdZac\n 5UVbD/4k/XXp2RKQ+afpzp4JgmJ2HFnUGnM8yK2jeOabris8YGgenopoYRf4uwxC8r2x9IlpgoH\n /uHY6bnLOfPHHlYU2mY9uYzTIHvCWnS4TAAW9Me10fXwSR9ZxOYZIyMEnPcpaPXqGAvA2M5O9iN\n n224o2omAlaT320LbypUw3oRXgZFpkyW5YY55QyVHo7IA2SoeeD1R9b6IHM2jNTL0yhSCJqNzq0\n nsmzjnUYNKF3PQ+m0XhpDywwZdt/qZ681lDLd2BbNT2IOFLls6z7DwxbPyeH5N9N7A3WGGGd4sB\n r5b58BUdDnvtwRaMX381bFeSvIcsttD/+nF9ISko2Cu6zkFV2PaVg+3HWprnbVlQTx3Z5f5eutk\n NN5637ID9GY2zJkx6Pos85qgsu/nIzTqZian4Nbh6hAEgJ8w5gAtJ76hzKyTErFaAFr2iqdExvn\n C9/ohb8PJC1snAzAImcA8jhtLWlByRQlxUe2QyFhLaoHDtgdyBlAGx63uIx+2TYi5jz4h9zNw/x\n ONcHxsjOAzPt65bmEId9Jr/A6Y91IaK+JGX28L6MEvCrY7zkumjgyh2aGlYNt8+cRibixfhXaUe\n oO5p8ygV1GXsHCdAiQAispXakUuR4p3WnmEPZTxLvzkJtRihbOeNYJR8t6Mte/bEiAvUmOucLdS\n 94voFGi2qnm6+NQ==","X-Developer-Key":"i=marcandre.lureau@redhat.com; a=openpgp;\n fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.17","Received-SPF":"pass client-ip=170.10.129.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_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_PASS=-0.001, 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 ","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 ALSA audio backend uses its own logging infrastructure (AUD_log,\nAUD_vlog, dolog, ldebug) and a custom alsa_dump_info() debug helper.\nThis approach is inconsistent with the rest of QEMU and makes the\noutput harder to filter and configure.\n\nReplace the custom logging with standard QEMU error reporting:\n- Use error_report() / error_printf() for errors\n- Use warn_report() for non-fatal warnings (invalid formats,\n rejected parameters, unexpected states)\n- Convert ldebug() calls and alsa_dump_info() to trace events\n\nRemove DEBUG_ALSA and AUDIO_CAP macros which are no longer needed.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Mark Cave-Ayland \n---\n audio/alsaaudio.c | 169 +++++++++++++++++++++--------------------------------\n audio/trace-events | 5 ++\n 2 files changed, 72 insertions(+), 102 deletions(-)","diff":"diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c\nindex 8f226b42612..889240ad0c7 100644\n--- a/audio/alsaaudio.c\n+++ b/audio/alsaaudio.c\n@@ -26,17 +26,15 @@\n #include \n #include \"qemu/main-loop.h\"\n #include \"qemu/module.h\"\n+#include \"qemu/error-report.h\"\n #include \"qemu/audio.h\"\n #include \"qom/object.h\"\n #include \"trace.h\"\n \n #pragma GCC diagnostic ignored \"-Waddress\"\n \n-#define AUDIO_CAP \"alsa\"\n #include \"audio_int.h\"\n \n-#define DEBUG_ALSA 0\n-\n #define TYPE_AUDIO_ALSA \"audio-alsa\"\n OBJECT_DECLARE_SIMPLE_TYPE(AudioALSA, AUDIO_ALSA)\n \n@@ -81,33 +79,29 @@ struct alsa_params_obt {\n snd_pcm_uframes_t samples;\n };\n \n-static void G_GNUC_PRINTF (2, 3) alsa_logerr (int err, const char *fmt, ...)\n+static void G_GNUC_PRINTF(2, 3) alsa_logerr(int err, const char *fmt, ...)\n {\n va_list ap;\n \n- va_start (ap, fmt);\n- AUD_vlog (AUDIO_CAP, fmt, ap);\n- va_end (ap);\n-\n- AUD_log (AUDIO_CAP, \"Reason: %s\\n\", snd_strerror (err));\n+ error_printf(\"alsa: \");\n+ va_start(ap, fmt);\n+ error_vprintf(fmt, ap);\n+ va_end(ap);\n+ error_printf(\" Reason: %s\", snd_strerror(err));\n+ error_printf(\"\\n\");\n }\n \n-static void G_GNUC_PRINTF (3, 4) alsa_logerr2 (\n- int err,\n- const char *typ,\n- const char *fmt,\n- ...\n- )\n+static void G_GNUC_PRINTF(3, 4) alsa_logerr2(int err, const char *typ,\n+ const char *fmt, ...)\n {\n va_list ap;\n \n- AUD_log (AUDIO_CAP, \"Could not initialize %s\\n\", typ);\n-\n- va_start (ap, fmt);\n- AUD_vlog (AUDIO_CAP, fmt, ap);\n- va_end (ap);\n-\n- AUD_log (AUDIO_CAP, \"Reason: %s\\n\", snd_strerror (err));\n+ error_printf(\"alsa: Could not initialize %s:\", typ);\n+ va_start(ap, fmt);\n+ error_vprintf(fmt, ap);\n+ va_end(ap);\n+ error_printf(\" Reason: %s\", snd_strerror(err));\n+ error_printf(\"\\n\");\n }\n \n static void alsa_fini_poll (struct pollhlp *hlp)\n@@ -130,7 +124,7 @@ static void alsa_anal_close1 (snd_pcm_t **handlep)\n {\n int err = snd_pcm_close (*handlep);\n if (err) {\n- alsa_logerr (err, \"Failed to close PCM handle %p\\n\", *handlep);\n+ alsa_logerr(err, \"Failed to close PCM handle %p\", *handlep);\n }\n *handlep = NULL;\n }\n@@ -145,7 +139,7 @@ static int alsa_recover (snd_pcm_t *handle)\n {\n int err = snd_pcm_prepare (handle);\n if (err < 0) {\n- alsa_logerr (err, \"Failed to prepare handle %p\\n\", handle);\n+ alsa_logerr(err, \"Failed to prepare handle %p\", handle);\n return -1;\n }\n return 0;\n@@ -155,7 +149,7 @@ static int alsa_resume (snd_pcm_t *handle)\n {\n int err = snd_pcm_resume (handle);\n if (err < 0) {\n- alsa_logerr (err, \"Failed to resume handle %p\\n\", handle);\n+ alsa_logerr(err, \"Failed to resume handle %p\", handle);\n return -1;\n }\n return 0;\n@@ -170,7 +164,7 @@ static void alsa_poll_handler (void *opaque)\n \n count = poll (hlp->pfds, hlp->count, 0);\n if (count < 0) {\n- dolog (\"alsa_poll_handler: poll %s\\n\", strerror (errno));\n+ warn_report(\"alsa_poll_handler: poll %s\", strerror(errno));\n return;\n }\n \n@@ -183,7 +177,7 @@ static void alsa_poll_handler (void *opaque)\n err = snd_pcm_poll_descriptors_revents (hlp->handle, hlp->pfds,\n hlp->count, &revents);\n if (err < 0) {\n- alsa_logerr (err, \"snd_pcm_poll_descriptors_revents\");\n+ alsa_logerr(err, \"snd_pcm_poll_descriptors_revents\");\n return;\n }\n \n@@ -215,7 +209,7 @@ static void alsa_poll_handler (void *opaque)\n break;\n \n default:\n- dolog (\"Unexpected state %d\\n\", state);\n+ warn_report(\"alsa: Unexpected state %d\", state);\n }\n }\n \n@@ -226,8 +220,8 @@ static int alsa_poll_helper (snd_pcm_t *handle, struct pollhlp *hlp, int mask)\n \n count = snd_pcm_poll_descriptors_count (handle);\n if (count <= 0) {\n- dolog (\"Could not initialize poll mode\\n\"\n- \"Invalid number of poll descriptors %d\\n\", count);\n+ warn_report(\"alsa: Could not initialize poll mode: \"\n+ \"Invalid number of poll descriptors %d\", count);\n return -1;\n }\n \n@@ -235,8 +229,7 @@ static int alsa_poll_helper (snd_pcm_t *handle, struct pollhlp *hlp, int mask)\n \n err = snd_pcm_poll_descriptors (handle, pfds, count);\n if (err < 0) {\n- alsa_logerr (err, \"Could not initialize poll mode\\n\"\n- \"Could not obtain poll descriptors\\n\");\n+ alsa_logerr(err, \"Could not initialize poll mode: Could not obtain poll descriptors\");\n g_free (pfds);\n return -1;\n }\n@@ -298,10 +291,7 @@ static snd_pcm_format_t aud_to_alsafmt(AudioFormat fmt, bool big_endian)\n return big_endian ? SND_PCM_FORMAT_FLOAT_BE : SND_PCM_FORMAT_FLOAT_LE;\n \n default:\n- dolog (\"Internal logic error: Bad audio format %d\\n\", fmt);\n-#ifdef DEBUG_AUDIO\n- abort ();\n-#endif\n+ warn_report(\"alsa: Internal logic error: Bad audio format %d\", fmt);\n return SND_PCM_FORMAT_U8;\n }\n }\n@@ -371,29 +361,13 @@ static int alsa_to_audfmt (snd_pcm_format_t alsafmt, AudioFormat *fmt,\n break;\n \n default:\n- dolog (\"Unrecognized audio format %d\\n\", alsafmt);\n+ warn_report(\"alsa: Unrecognized audio format %d\", alsafmt);\n return -1;\n }\n \n return 0;\n }\n \n-static void alsa_dump_info (struct alsa_params_req *req,\n- struct alsa_params_obt *obt,\n- snd_pcm_format_t obtfmt,\n- AudiodevAlsaPerDirectionOptions *apdo)\n-{\n- dolog(\"parameter | requested value | obtained value\\n\");\n- dolog(\"format | %10d | %10d\\n\", req->fmt, obtfmt);\n- dolog(\"channels | %10d | %10d\\n\",\n- req->nchannels, obt->nchannels);\n- dolog(\"frequency | %10d | %10d\\n\", req->freq, obt->freq);\n- dolog(\"============================================\\n\");\n- dolog(\"requested: buffer len %\" PRId32 \" period len %\" PRId32 \"\\n\",\n- apdo->buffer_length, apdo->period_length);\n- dolog(\"obtained: samples %ld\\n\", obt->samples);\n-}\n-\n static void alsa_set_threshold (snd_pcm_t *handle, snd_pcm_uframes_t threshold)\n {\n int err;\n@@ -403,23 +377,22 @@ static void alsa_set_threshold (snd_pcm_t *handle, snd_pcm_uframes_t threshold)\n \n err = snd_pcm_sw_params_current (handle, sw_params);\n if (err < 0) {\n- dolog (\"Could not fully initialize DAC\\n\");\n- alsa_logerr (err, \"Failed to get current software parameters\\n\");\n+ error_report(\"alsa: Could not fully initialize DAC\");\n+ alsa_logerr(err, \"Failed to get current software parameters\");\n return;\n }\n \n err = snd_pcm_sw_params_set_start_threshold (handle, sw_params, threshold);\n if (err < 0) {\n- dolog (\"Could not fully initialize DAC\\n\");\n- alsa_logerr (err, \"Failed to set software threshold to %ld\\n\",\n- threshold);\n+ error_report(\"alsa: Could not fully initialize DAC\");\n+ alsa_logerr(err, \"Failed to set software threshold to %ld\", threshold);\n return;\n }\n \n err = snd_pcm_sw_params (handle, sw_params);\n if (err < 0) {\n- dolog (\"Could not fully initialize DAC\\n\");\n- alsa_logerr (err, \"Failed to set software parameters\\n\");\n+ error_report(\"alsa: Could not fully initialize DAC\");\n+ alsa_logerr(err, \"Failed to set software parameters\");\n return;\n }\n }\n@@ -451,13 +424,13 @@ static int alsa_open(bool in, struct alsa_params_req *req,\n SND_PCM_NONBLOCK\n );\n if (err < 0) {\n- alsa_logerr2 (err, typ, \"Failed to open `%s':\\n\", pcm_name);\n+ alsa_logerr2(err, typ, \"Failed to open `%s'\", pcm_name);\n return -1;\n }\n \n err = snd_pcm_hw_params_any (handle, hw_params);\n if (err < 0) {\n- alsa_logerr2 (err, typ, \"Failed to initialize hardware parameters\\n\");\n+ alsa_logerr2(err, typ, \"Failed to initialize hardware parameters\");\n goto err;\n }\n \n@@ -467,18 +440,18 @@ static int alsa_open(bool in, struct alsa_params_req *req,\n SND_PCM_ACCESS_RW_INTERLEAVED\n );\n if (err < 0) {\n- alsa_logerr2 (err, typ, \"Failed to set access type\\n\");\n+ alsa_logerr2(err, typ, \"Failed to set access type\");\n goto err;\n }\n \n err = snd_pcm_hw_params_set_format (handle, hw_params, req->fmt);\n if (err < 0) {\n- alsa_logerr2 (err, typ, \"Failed to set format %d\\n\", req->fmt);\n+ alsa_logerr2(err, typ, \"Failed to set format %d\", req->fmt);\n }\n \n err = snd_pcm_hw_params_set_rate_near (handle, hw_params, &freq, 0);\n if (err < 0) {\n- alsa_logerr2 (err, typ, \"Failed to set frequency %d\\n\", req->freq);\n+ alsa_logerr2(err, typ, \"Failed to set frequency %d\", req->freq);\n goto err;\n }\n \n@@ -488,8 +461,7 @@ static int alsa_open(bool in, struct alsa_params_req *req,\n &nchannels\n );\n if (err < 0) {\n- alsa_logerr2 (err, typ, \"Failed to set number of channels %d\\n\",\n- req->nchannels);\n+ alsa_logerr2(err, typ, \"Failed to set number of channels %d\", req->nchannels);\n goto err;\n }\n \n@@ -501,14 +473,14 @@ static int alsa_open(bool in, struct alsa_params_req *req,\n handle, hw_params, &btime, &dir);\n \n if (err < 0) {\n- alsa_logerr2(err, typ, \"Failed to set buffer time to %\" PRId32 \"\\n\",\n+ alsa_logerr2(err, typ, \"Failed to set buffer time to %\" PRId32,\n apdo->buffer_length);\n goto err;\n }\n \n if (apdo->has_buffer_length && btime != apdo->buffer_length) {\n- dolog(\"Requested buffer time %\" PRId32\n- \" was rejected, using %u\\n\", apdo->buffer_length, btime);\n+ warn_report(\"alsa: Requested buffer time %\" PRId32 \" was rejected, using %u\",\n+ apdo->buffer_length, btime);\n }\n }\n \n@@ -520,43 +492,43 @@ static int alsa_open(bool in, struct alsa_params_req *req,\n &dir);\n \n if (err < 0) {\n- alsa_logerr2(err, typ, \"Failed to set period time to %\" PRId32 \"\\n\",\n+ alsa_logerr2(err, typ, \"Failed to set period time to %\" PRId32,\n apdo->period_length);\n goto err;\n }\n \n if (apdo->has_period_length && ptime != apdo->period_length) {\n- dolog(\"Requested period time %\" PRId32 \" was rejected, using %d\\n\",\n- apdo->period_length, ptime);\n+ warn_report(\"alsa: Requested period time %\" PRId32 \" was rejected, using %d\",\n+ apdo->period_length, ptime);\n }\n }\n \n err = snd_pcm_hw_params (handle, hw_params);\n if (err < 0) {\n- alsa_logerr2 (err, typ, \"Failed to apply audio parameters\\n\");\n+ alsa_logerr2(err, typ, \"Failed to apply audio parameters\");\n goto err;\n }\n \n err = snd_pcm_hw_params_get_buffer_size (hw_params, &obt_buffer_size);\n if (err < 0) {\n- alsa_logerr2 (err, typ, \"Failed to get buffer size\\n\");\n+ alsa_logerr2(err, typ, \"Failed to get buffer size\");\n goto err;\n }\n \n err = snd_pcm_hw_params_get_format (hw_params, &obtfmt);\n if (err < 0) {\n- alsa_logerr2 (err, typ, \"Failed to get format\\n\");\n+ alsa_logerr2(err, typ, \"Failed to get format\");\n goto err;\n }\n \n if (alsa_to_audfmt (obtfmt, &obt->fmt, &obt->endianness)) {\n- dolog (\"Invalid format was returned %d\\n\", obtfmt);\n+ error_report(\"alsa: Invalid format was returned %d\", obtfmt);\n goto err;\n }\n \n err = snd_pcm_prepare (handle);\n if (err < 0) {\n- alsa_logerr2 (err, typ, \"Could not prepare handle %p\\n\", handle);\n+ alsa_logerr2(err, typ, \"Could not prepare handle %p\", handle);\n goto err;\n }\n \n@@ -574,11 +546,9 @@ static int alsa_open(bool in, struct alsa_params_req *req,\n \n *handlep = handle;\n \n- if (DEBUG_ALSA || obtfmt != req->fmt ||\n- obt->nchannels != req->nchannels || obt->freq != req->freq) {\n- dolog (\"Audio parameters for %s\\n\", typ);\n- alsa_dump_info(req, obt, obtfmt, apdo);\n- }\n+ trace_alsa_info_params(req->fmt, obtfmt, req->nchannels, obt->nchannels,\n+ req->freq, obt->freq);\n+ trace_alsa_info_samples(apdo->buffer_length, apdo->period_length, obt->samples);\n \n return 0;\n \n@@ -601,8 +571,7 @@ static size_t alsa_buffer_get_free(HWVoiceOut *hw)\n }\n }\n if (avail < 0) {\n- alsa_logerr(avail,\n- \"Could not obtain number of available frames\\n\");\n+ alsa_logerr(avail, \"Could not obtain number of available frames\");\n avail = 0;\n }\n }\n@@ -643,8 +612,7 @@ static size_t alsa_write(HWVoiceOut *hw, void *buf, size_t len)\n \n case -EPIPE:\n if (alsa_recover(alsa->handle)) {\n- alsa_logerr(written, \"Failed to write %zu frames\\n\",\n- len_frames);\n+ alsa_logerr(written, \"Failed to write %zu frames\", len_frames);\n return pos;\n }\n trace_alsa_xrun_out();\n@@ -656,8 +624,7 @@ static size_t alsa_write(HWVoiceOut *hw, void *buf, size_t len)\n * recovery\n */\n if (alsa_resume(alsa->handle)) {\n- alsa_logerr(written, \"Failed to write %zu frames\\n\",\n- len_frames);\n+ alsa_logerr(written, \"Failed to write %zu frames\", len_frames);\n return pos;\n }\n trace_alsa_resume_out();\n@@ -667,8 +634,7 @@ static size_t alsa_write(HWVoiceOut *hw, void *buf, size_t len)\n return pos;\n \n default:\n- alsa_logerr(written, \"Failed to write %zu frames from %p\\n\",\n- len, src);\n+ alsa_logerr(written, \"Failed to write %zu frames from %p\", len_frames, src);\n return pos;\n }\n }\n@@ -687,7 +653,7 @@ static void alsa_fini_out (HWVoiceOut *hw)\n {\n ALSAVoiceOut *alsa = (ALSAVoiceOut *) hw;\n \n- ldebug (\"alsa_fini\\n\");\n+ trace_alsa_fini_out();\n alsa_anal_close (&alsa->handle, &alsa->pollhlp);\n }\n \n@@ -732,19 +698,19 @@ static int alsa_voice_ctl (snd_pcm_t *handle, const char *typ, int ctl)\n if (ctl == VOICE_CTL_PAUSE) {\n err = snd_pcm_drop (handle);\n if (err < 0) {\n- alsa_logerr (err, \"Could not stop %s\\n\", typ);\n+ alsa_logerr(err, \"Could not stop %s\", typ);\n return -1;\n }\n } else {\n err = snd_pcm_prepare (handle);\n if (err < 0) {\n- alsa_logerr (err, \"Could not prepare handle for %s\\n\", typ);\n+ alsa_logerr(err, \"Could not prepare handle for %s\", typ);\n return -1;\n }\n if (ctl == VOICE_CTL_START) {\n err = snd_pcm_start(handle);\n if (err < 0) {\n- alsa_logerr (err, \"Could not start handle for %s\\n\", typ);\n+ alsa_logerr(err, \"Could not start handle for %s\", typ);\n return -1;\n }\n }\n@@ -758,17 +724,17 @@ static void alsa_enable_out(HWVoiceOut *hw, bool enable)\n ALSAVoiceOut *alsa = (ALSAVoiceOut *) hw;\n AudiodevAlsaPerDirectionOptions *apdo = hw->s->dev->u.alsa.out;\n \n+ trace_alsa_enable_out(enable);\n+\n if (enable) {\n bool poll_mode = apdo->try_poll;\n \n- ldebug(\"enabling voice\\n\");\n if (poll_mode && alsa_poll_out(hw)) {\n poll_mode = 0;\n }\n hw->poll_mode = poll_mode;\n alsa_voice_ctl(alsa->handle, \"playback\", VOICE_CTL_PREPARE);\n } else {\n- ldebug(\"disabling voice\\n\");\n if (hw->poll_mode) {\n hw->poll_mode = 0;\n alsa_fini_poll(&alsa->pollhlp);\n@@ -834,7 +800,7 @@ static size_t alsa_read(HWVoiceIn *hw, void *buf, size_t len)\n \n case -EPIPE:\n if (alsa_recover(alsa->handle)) {\n- alsa_logerr(nread, \"Failed to read %zu frames\\n\", len);\n+ alsa_logerr(nread, \"Failed to read %zu frames\", len);\n return pos;\n }\n trace_alsa_xrun_in();\n@@ -844,8 +810,7 @@ static size_t alsa_read(HWVoiceIn *hw, void *buf, size_t len)\n return pos;\n \n default:\n- alsa_logerr(nread, \"Failed to read %zu frames to %p\\n\",\n- len, dst);\n+ alsa_logerr(nread, \"Failed to read %zu frames to %p\", len, dst);\n return pos;\n }\n }\n@@ -862,10 +827,11 @@ static void alsa_enable_in(HWVoiceIn *hw, bool enable)\n ALSAVoiceIn *alsa = (ALSAVoiceIn *) hw;\n AudiodevAlsaPerDirectionOptions *apdo = hw->s->dev->u.alsa.in;\n \n+ trace_alsa_enable_in(enable);\n+\n if (enable) {\n bool poll_mode = apdo->try_poll;\n \n- ldebug(\"enabling voice\\n\");\n if (poll_mode && alsa_poll_in(hw)) {\n poll_mode = 0;\n }\n@@ -873,7 +839,6 @@ static void alsa_enable_in(HWVoiceIn *hw, bool enable)\n \n alsa_voice_ctl(alsa->handle, \"capture\", VOICE_CTL_START);\n } else {\n- ldebug (\"disabling voice\\n\");\n if (hw->poll_mode) {\n hw->poll_mode = 0;\n alsa_fini_poll(&alsa->pollhlp);\ndiff --git a/audio/trace-events b/audio/trace-events\nindex f7f639d9605..737e3e60694 100644\n--- a/audio/trace-events\n+++ b/audio/trace-events\n@@ -9,6 +9,11 @@ alsa_read_zero(long len) \"Failed to read %ld frames (read zero)\"\n alsa_xrun_out(void) \"Recovering from playback xrun\"\n alsa_xrun_in(void) \"Recovering from capture xrun\"\n alsa_resume_out(void) \"Resuming suspended output stream\"\n+alsa_info_params(int req_fmt, int obt_fmt, int req_channels, int obt_channels, int req_freq, int obt_freq) \"format %d->%d, channels %d->%d, frequency %d->%d\"\n+alsa_info_samples(int buffer_length, int period_length, long samples) \"requested: buffer len %d, period len %d; obtained: %ld samples\"\n+alsa_fini_out(void) \"\"\n+alsa_enable_out(bool enable) \"enable=%d\"\n+alsa_enable_in(bool enable) \"enable=%d\"\n \n # ossaudio.c\n oss_version(int version) \"OSS version = 0x%x\"\n","prefixes":["59/85"]}