{"id":2196864,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2196864/?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-22-e676662e4514@redhat.com>","date":"2026-02-16T11:15:11","name":"[22/85] audio: simplify audio_init()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c706242c8d1bf0a644d90c5c38cc10151bc5e849","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-22-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/2196864/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=KvHooYU/;\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 4fF0qq4yWYz1xwF\n\tfor ; Mon, 16 Feb 2026 22:27:35 +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 1vrwdX-0000LJ-Bm; Mon, 16 Feb 2026 06:19:31 -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 1vrwb3-0005Oq-Lu\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:17:04 -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 1vrwav-0007UA-OG\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:16:52 -0500","from mx-prod-mc-08.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-102-9K88Oy9KPICHbPifigC9Tg-1; Mon,\n 16 Feb 2026 06:16:42 -0500","from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 45B5F1800465; Mon, 16 Feb 2026 11:16:40 +0000 (UTC)","from localhost (unknown [10.45.242.26])\n by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id E625630001B9; Mon, 16 Feb 2026 11:16:38 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1771240606;\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=LnSaRxBAGTqpOnRjgcU7fK6qN6/pVq5+xwI7hZXDScs=;\n b=KvHooYU/5PRR1jGxt/ShjiKQ73H6WqiW7PDZRowjnfPYpD2MYSf0hKrxOTy0UX/cMGFscF\n 48OuXir78NInPhH37t0GJG6cNZkYT1avX7FBU9ysHX3MBZeicTL7ACDHUBR2pdg7OnJ3Gh\n f/pwjL1RYH15VPOeGYO7TC12g8wcuv8=","X-MC-Unique":"9K88Oy9KPICHbPifigC9Tg-1","X-Mimecast-MFC-AGG-ID":"9K88Oy9KPICHbPifigC9Tg_1771240600","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Date":"Mon, 16 Feb 2026 12:15:11 +0100","Subject":"[PATCH 22/85] audio: simplify audio_init()","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"8bit","Message-Id":"<20260216-audio-v1-22-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=4073;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=K/qLh28e2vPgm33e8WRKkMMDOHVC8mGtCBftRfM7Y78=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBpkvxPuWQjmx+oAltbb6CXK981lEPRn579VgwUM\n BP+4Z5bxBSJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaZL8TwAKCRDa6OEJdZac\n 5bgSD/9rUthyG3AFSNVI0xfNO8rT0yVrZymsmKqCeO4cVmf+zCoACx+uUNKiu6ePb2Kf9wo2KzU\n YSOpuk5GWAPC2vrgCyyPMn6whCoJpO3/VLqk9T1J618ttpwZcAJZjMzu/yAqdjTaubIZaJGeype\n 6J2dB5EWvCtzuRDRHrs//W1q6JVsH3F7Vq8qekTP7iTbn98OcAmwH4R/yAci1jdWf+R7hIFYR8Z\n LjbmlvX02P0W+BJWYvm2+JeMgrD9rQvpWi+V6GehY3VbuYcHL6zMConcsIlF3fyL83D3d2F+1n7\n ShCZBB801J+7nUY0m4YRG7x3WcJg5kFQ12FMb55MULX66cA14EjMzRirps8NB6n1HW1OzjqVtbK\n zuw1HWCXafcGCTPhx2G1ICi//dp8LYOPJ9+p8VcfLRCEEd8FIViye9sCPpl3lLHFSn1op8pHFbR\n hCtfPEAyEesbztFukJfq2r6StLrcqAYdCYyYibCw1+ov0+1qnFSAC8p8lE3tB66gMTb4LAr9iP6\n Pp9XSxZhvJSNNrx+p6YIR8t5QXOCiwPF34QpgBK9hsS1dRqTqtnrO+S/g9ByGMqmx2LZ0KGkujr\n oMEIJEfEfHxrrtiRXtvAaJIAX4nFuSa1wXtj8PaDsRTTUGkOr5HzhPyZSkInZaTFwV2oXqpJtBt\n iNEE/F7LmaMSSKQ==","X-Developer-Key":"i=marcandre.lureau@redhat.com; a=openpgp;\n fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.4","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":"Factorize looking up the driver in audio_driver_init()\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Mark Cave-Ayland \n---\n audio/audio.c | 66 ++++++++++++++++++++++++++---------------------------------\n 1 file changed, 29 insertions(+), 37 deletions(-)","diff":"diff --git a/audio/audio.c b/audio/audio.c\nindex c4e4adec106..10e32bcbb1a 100644\n--- a/audio/audio.c\n+++ b/audio/audio.c\n@@ -1562,11 +1562,18 @@ size_t audio_generic_read(HWVoiceIn *hw, void *buf, size_t size)\n return total;\n }\n \n-static bool audio_driver_do_init(AudioMixengBackend *s, struct audio_driver *drv,\n- Audiodev *dev, Error **errp)\n+static bool audio_driver_do_init(AudioMixengBackend *d, Error **errp)\n {\n- s->drv_opaque = drv->init(dev, errp);\n- if (!s->drv_opaque) {\n+ const char *drvname = AudiodevDriver_str(d->dev->driver);\n+ struct audio_driver *drv = audio_driver_lookup(drvname);\n+\n+ if (!drv) {\n+ error_setg(errp, \"Unknown audio driver `%s'\", drvname);\n+ return false;\n+ }\n+\n+ d->drv_opaque = drv->init(d->dev, errp);\n+ if (!d->drv_opaque) {\n return false;\n }\n \n@@ -1579,14 +1586,14 @@ static bool audio_driver_do_init(AudioMixengBackend *s, struct audio_driver *drv\n drv->pcm_ops->put_buffer_out = audio_generic_put_buffer_out;\n }\n \n- audio_init_nb_voices_out(s, drv, 1);\n- audio_init_nb_voices_in(s, drv, 0);\n- s->drv = drv;\n+ audio_init_nb_voices_out(d, drv, 1);\n+ audio_init_nb_voices_in(d, drv, 0);\n+ d->drv = drv;\n \n- if (dev->timer_period <= 0) {\n- s->period_ticks = 1;\n+ if (d->dev->timer_period <= 0) {\n+ d->period_ticks = 1;\n } else {\n- s->period_ticks = dev->timer_period * (int64_t)SCALE_US;\n+ d->period_ticks = d->dev->timer_period * (int64_t)SCALE_US;\n }\n \n return true;\n@@ -1786,24 +1793,12 @@ void audio_create_default_audiodevs(void)\n */\n static AudioBackend *audio_init(Audiodev *dev, Error **errp)\n {\n- int done = 0;\n- const char *drvname;\n- AudioMixengBackend *s;\n- struct audio_driver *driver;\n+ AudioMixengBackend *d;\n \n- s = AUDIO_MIXENG_BACKEND(object_new(TYPE_AUDIO_MIXENG_BACKEND));\n-\n- if (dev) {\n- /* -audiodev option */\n- s->dev = dev;\n- drvname = AudiodevDriver_str(dev->driver);\n- driver = audio_driver_lookup(drvname);\n- if (driver) {\n- done = audio_driver_do_init(s, driver, dev, errp);\n- } else {\n- error_setg(errp, \"Unknown audio driver `%s'\", drvname);\n- }\n- if (!done) {\n+ d = AUDIO_MIXENG_BACKEND(object_new(TYPE_AUDIO_MIXENG_BACKEND));\n+ d->dev = dev;\n+ if (d->dev) {\n+ if (!audio_driver_do_init(d, errp)) {\n goto out;\n }\n } else {\n@@ -1814,27 +1809,24 @@ static AudioBackend *audio_init(Audiodev *dev, Error **errp)\n error_setg(errp, \"no default audio driver available\");\n goto out;\n }\n- s->dev = dev = e->dev;\n+ d->dev = e->dev;\n QSIMPLEQ_REMOVE_HEAD(&default_audiodevs, next);\n g_free(e);\n- drvname = AudiodevDriver_str(dev->driver);\n- driver = audio_driver_lookup(drvname);\n- if (audio_driver_do_init(s, driver, dev, NULL)) {\n+ if (audio_driver_do_init(d, NULL)) {\n break;\n }\n- qapi_free_Audiodev(dev);\n- s->dev = NULL;\n }\n }\n \n- if (!object_property_try_add_child(get_audiodevs_root(), dev->id, OBJECT(s), errp)) {\n+ if (!object_property_try_add_child(get_audiodevs_root(),\n+ d->dev->id, OBJECT(d), errp)) {\n goto out;\n }\n- object_unref(s);\n- return AUDIO_BACKEND(s);\n+ object_unref(d);\n+ return AUDIO_BACKEND(d);\n \n out:\n- object_unref(s);\n+ object_unref(d);\n return NULL;\n }\n \n","prefixes":["22/85"]}