{"id":2196838,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2196838/?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-68-e676662e4514@redhat.com>","date":"2026-02-16T11:15:57","name":"[68/85] audio/sdl: replace custom logging with error_report","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9bb2dab03e6a7433546f8cd8f2b0b0ea4094a4ba","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-68-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/2196838/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=VIM2LYGj;\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 4fF0lq5YVsz1xxp\n\tfor ; Mon, 16 Feb 2026 22:24:07 +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 1vrwfe-0000Gy-79; Mon, 16 Feb 2026 06:21:42 -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 1vrwcz-0007OJ-9n\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:19:05 -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 1vrwcx-0008PL-HP\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:18:57 -0500","from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-34-R09qfEgPMLCnKkap6eOMzQ-1; Mon,\n 16 Feb 2026 06:18:51 -0500","from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111])\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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 6F4281800259; Mon, 16 Feb 2026 11:18:49 +0000 (UTC)","from localhost (unknown [10.45.242.26])\n by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 5BEA618003F5; Mon, 16 Feb 2026 11:18:48 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1771240734;\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=VFkfaoxr/ut97cWdnq1cYjjnuVQk6XLSkYyC2tDUZnU=;\n b=VIM2LYGjete46DWD0VlizwdSBHMQOXQyS4oDxMVfJXw/76yN2lNJ7r7sC6TsLP/RCGqLfb\n afpC0zDITQoZyQEY+uVrlLIq8bpwFZGG/xexsZ3vfoZzYsj2g0xgRXputKErqumEBC8RTd\n j+js0dA3kXHoyGYSQziPwxISMP/hVhY=","X-MC-Unique":"R09qfEgPMLCnKkap6eOMzQ-1","X-Mimecast-MFC-AGG-ID":"R09qfEgPMLCnKkap6eOMzQ_1771240729","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Date":"Mon, 16 Feb 2026 12:15:57 +0100","Subject":"[PATCH 68/85] audio/sdl: replace custom logging with error_report","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"8bit","Message-Id":"<20260216-audio-v1-68-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 ,\n Thomas Huth ","X-Developer-Signature":"v=1; a=openpgp-sha256; l=4310;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=Gn3WILxoPJAdsQuhXzBqAuStlGu4nqLwJFp2NZ4IZow=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBpkvxRETj/q3txCvED93aDLMvSuZ8Ocd/u4aov9\n GG9p9nZp3+JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaZL8UQAKCRDa6OEJdZac\n 5eqUD/97hpvOdcFFIZH/83/e20nye1/j7tZQsFEEejX/jrJ8WNJ7GYy02PJp0miTn2LJ1hI1W6P\n x9di2RYPVlurujFPSsOKQgAQ6+ExFhXP+Q2uVZfg2CTb/bfOuTIAb182dzNuibzcrT+7JiLbwmo\n /W+r8ZsVBf5FVtM6aSV6ceXn35mhMRVRbn/DlsY70UMBmjC4sLgT4R2ETni5ZTJyq7oujoz7kuc\n djhBVnTiFpbz/KYDR5JJKqM6bf7XH2zByQRr+qmRMngRUjyG5SBQJFqmqwCH/dao2DDFiMtjy8B\n +16380/SysbKAyTR8WUr+zj5LTeE9jRmtCzcMSWSykbobvf0114iKJrYFKV0vPb2gUZ/pYlCjvh\n hIXWX3K5tMQhGFw/vDyK64T3JI5RNgPEPYKhNHVEV4VDVVEYOTvBALcCbDK+4KtSUark9Fep+YU\n yKn2w1pzHios0T5b0h3LRBl/FtzlppHXeHo38X8mZVQ38U24i8xjQdRH9D4jvg9BpNMJ+wkQTR4\n Rx6tSPG8PjH+Lw+OmijFvbz2qhJgaX2zE9ngbmCthaEHdXgfWBA4CY+lwd+ecgmc3kDs5FSuTHW\n 82vxX1CD4wgFjznXWWV625L+dAvXGR5vrcfRFcD2btn1UsJkp4Lhojrvm0koatBtnCo/sUZ4zsM\n wobr+H3DV3J8afg==","X-Developer-Key":"i=marcandre.lureau@redhat.com; a=openpgp;\n fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.111","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 ","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":"Replace the custom audio logging infrastructure (dolog macro and\nAUD_log/AUD_vlog) with standard QEMU error reporting (error_report,\nerror_printf, error_vprintf).\n\nNote that we also dropped the abort() call in DEBUG_AUDIO, as it is not\nusually compiled with, doesn't help much, and can easily be added back\nwhen doing development as needed.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Mark Cave-Ayland \nReviewed-by: Thomas Huth \n---\n audio/sdlaudio.c | 36 +++++++++---------------------------\n 1 file changed, 9 insertions(+), 27 deletions(-)","diff":"diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c\nindex d974d7eac46..5f332678209 100644\n--- a/audio/sdlaudio.c\n+++ b/audio/sdlaudio.c\n@@ -26,6 +26,7 @@\n #include \n #include \n #include \"qemu/module.h\"\n+#include \"qemu/error-report.h\"\n #include \"qapi/error.h\"\n #include \"qemu/audio.h\"\n #include \"qom/object.h\"\n@@ -38,7 +39,6 @@\n #endif\n #endif\n \n-#define AUDIO_CAP \"sdl\"\n #include \"audio_int.h\"\n \n #define TYPE_AUDIO_SDL \"audio-sdl\"\n@@ -67,17 +67,6 @@ typedef struct SDLVoiceIn {\n SDL_AudioDeviceID devid;\n } SDLVoiceIn;\n \n-static void G_GNUC_PRINTF (1, 2) sdl_logerr (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\", SDL_GetError ());\n-}\n-\n static int aud_to_sdlfmt (AudioFormat fmt)\n {\n switch (fmt) {\n@@ -102,10 +91,7 @@ static int aud_to_sdlfmt (AudioFormat fmt)\n return AUDIO_F32LSB;\n \n default:\n- dolog (\"Internal logic error: Bad audio format %d\\n\", fmt);\n-#ifdef DEBUG_AUDIO\n- abort ();\n-#endif\n+ error_report(\"sdl: internal logic error: bad audio format %d\", fmt);\n return AUDIO_U8;\n }\n }\n@@ -164,7 +150,7 @@ static int sdl_to_audfmt(int sdlfmt, AudioFormat *fmt, int *endianness)\n break;\n \n default:\n- dolog (\"Unrecognized SDL audio format %d\\n\", sdlfmt);\n+ error_report(\"sdl: unrecognized audio format %d\", sdlfmt);\n return -1;\n }\n \n@@ -182,27 +168,27 @@ static SDL_AudioDeviceID sdl_open(SDL_AudioSpec *req, SDL_AudioSpec *obt,\n /* Make sure potential threads created by SDL don't hog signals. */\n err = sigfillset (&new);\n if (err) {\n- dolog (\"sdl_open: sigfillset failed: %s\\n\", strerror (errno));\n+ error_report(\"sdl: sigfillset failed: %s\", strerror (errno));\n return 0;\n }\n err = pthread_sigmask (SIG_BLOCK, &new, &old);\n if (err) {\n- dolog (\"sdl_open: pthread_sigmask failed: %s\\n\", strerror (err));\n+ error_report(\"sdl: pthread_sigmask failed: %s\", strerror (err));\n return 0;\n }\n #endif\n \n devid = SDL_OpenAudioDevice(NULL, rec, req, obt, 0);\n if (!devid) {\n- sdl_logerr(\"SDL_OpenAudioDevice for %s failed\\n\",\n- rec ? \"recording\" : \"playback\");\n+ error_report(\"SDL_OpenAudioDevice for %s failed: %s\",\n+ rec ? \"recording\" : \"playback\", SDL_GetError());\n }\n \n #ifndef _WIN32\n err = pthread_sigmask (SIG_SETMASK, &old, NULL);\n if (err) {\n- dolog (\"sdl_open: pthread_sigmask (restore) failed: %s\\n\",\n- strerror (errno));\n+ error_report(\"sdl: pthread_sigmask (restore) failed: %s\",\n+ strerror (errno));\n /* We have failed to restore original signal mask, all bets are off,\n so exit the process */\n exit (EXIT_FAILURE);\n@@ -233,8 +219,6 @@ static void sdl_callback_out(void *opaque, Uint8 *buf, int len)\n \n if (!sdl->exit) {\n \n- /* dolog(\"callback_out: len=%d avail=%zu\\n\", len, hw->pending_emul); */\n-\n while (hw->pending_emul && len) {\n size_t write_len, start;\n \n@@ -283,8 +267,6 @@ static void sdl_callback_in(void *opaque, Uint8 *buf, int len)\n return;\n }\n \n- /* dolog(\"callback_in: len=%d pending=%zu\\n\", len, hw->pending_emul); */\n-\n while (hw->pending_emul < hw->size_emul && len) {\n size_t read_len = MIN(len, MIN(hw->size_emul - hw->pos_emul,\n hw->size_emul - hw->pending_emul));\n","prefixes":["68/85"]}