Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2196829/?format=api
{ "id": 2196829, "url": "http://patchwork.ozlabs.org/api/patches/2196829/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260216-audio-v1-56-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-56-e676662e4514@redhat.com>", "list_archive_url": null, "date": "2026-02-16T11:15:45", "name": "[56/85] audio: remove audio_driver", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "617d0dce0034649181ee3c8bad41b4140f3f25a6", "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-56-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/2196829/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2196829/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=Ft9o61Lz;\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 4fF0ks61yDz1xxp\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 16 Feb 2026 22:23:17 +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 1vrwfJ-0005uv-PF; Mon, 16 Feb 2026 06:21:21 -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 1vrwcS-0006ms-NL\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:18:27 -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 <marcandre.lureau@redhat.com>)\n id 1vrwcP-0008Ex-Pm\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:18:24 -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-49-V7sCawgRP0OStQvAMraFNg-1; Mon,\n 16 Feb 2026 06:18:17 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 7ED5F195605C; Mon, 16 Feb 2026 11:18:15 +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 C5EA230001B9; Mon, 16 Feb 2026 11:18:14 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1771240701;\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=LCOy/goLs2TwldRqrNhKvcGGMixVtj9WQh4RsXyO41Q=;\n b=Ft9o61LzdjGE3AThLAuTbuVFJ784tVpn3/NIHoZswh70GVIcYfGz8fu655cFgVO1h91aIV\n nG4TtufMASfDfnpsOk8zddH1rIyEqBLFPDdWgWPP40VemYvoYMY2Bw+6Q3enRCWoh6vrm0\n OJxqSnfdMIhq6r6PJQ6Qw3VwXsKquxs=", "X-MC-Unique": "V7sCawgRP0OStQvAMraFNg-1", "X-Mimecast-MFC-AGG-ID": "V7sCawgRP0OStQvAMraFNg_1771240695", "From": "=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>", "Date": "Mon, 16 Feb 2026 12:15:45 +0100", "Subject": "[PATCH 56/85] audio: remove audio_driver", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "8bit", "Message-Id": "<20260216-audio-v1-56-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=26851;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=eov+yl9HxRh/mzkXBewE8Zp+1GhaCy5G7F70BydXeMc=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBpkvxRvgojbNGLRLDN0LyW+V9MXAOKrN5zGdS2n\n MaxNtFtQseJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaZL8UQAKCRDa6OEJdZac\n 5V/PD/4us8wH3a8cMTPUe+STNaSt9C0WbUjXGAcIDrBOyND7pQYa2vE9kr8RZWu2f2/bGCmFyoo\n 6T5l/TkAnvB6Eag4ZjHFzKmulPNRzarDWoG8ibX0QFy2TkpyK4uPt5jSK9eTI+RgjCLP1F1DLP3\n FLGPIbPewMCxAWfhmRpDYVTnKv7l/jTKm3TnMh0SHlTFIKjgSRZYm7smnL2JgZRFkIES4aKV53d\n GeYEm64l7/CCXxzOsnvGmtlgYyHZif/ptZ6DNhUXR4kE6AmkoGTLyexR/XnYSzIxu8XpXOTse+G\n F74MlVdNEhY4Ns/c4ea4ZH/wTBoVBK77M5aadsU0La3PMBpbeyb4gsZaUsA0Mlhj5Jo2kt5rynA\n WuaH4nDSIWmi0fgvu9qe3IWN/RsR2qUUR1xv/kLD2s0VdFIWh7SHmrDL27prZ+kWhaBISbdSC3a\n nPzTcDOIYE47TsKkBBv8ZvLpbMhXmrJVG0zlR5xq2Ze0JVLawhzja/YJiSaFVPwBEQQ63iN58v9\n 1TyzLTjOkGNnopuHNIRGLIjjkp7kaIrMsAGzVhkvqdXMYRJKwpS+QwrnIhUWS/txsTcc52XyhKC\n 87RfgjfrtqXzna/ozVP70mPGdym0kwoEzY7BujrScEakTwmlWMyReBWVd+R8wCqXSLu9tRmzwDv\n UZdlX0Rt8AKwGoQ==", "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.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 <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": "Move all fields from audio_driver directly into AudioMixengBackendClass,\neliminating an unnecessary extra struct. Drivers now set class\nfields directly in class_init instead of creating a static audio_driver\ninstance.\n\nSigned-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>\nReviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>\nReviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>\n---\n audio/audio_int.h | 18 +++++----------\n audio/audio_template.h | 58 +++++++++++++++++++++++--------------------------\n audio/alsaaudio.c | 17 +++++----------\n audio/audio-mixeng-be.c | 20 ++++++++---------\n audio/dbusaudio.c | 17 +++++----------\n audio/dsoundaudio.c | 17 +++++----------\n audio/jackaudio.c | 17 +++++----------\n audio/noaudio.c | 28 ++++++++++--------------\n audio/ossaudio.c | 17 +++++----------\n audio/paaudio.c | 17 +++++----------\n audio/pwaudio.c | 17 +++++----------\n audio/sdlaudio.c | 17 +++++----------\n audio/sndioaudio.c | 27 ++++++++++-------------\n audio/spiceaudio.c | 36 +++++++++++++-----------------\n audio/wavaudio.c | 28 ++++++++++--------------\n audio/coreaudio.m | 28 ++++++++++--------------\n 16 files changed, 149 insertions(+), 230 deletions(-)", "diff": "diff --git a/audio/audio_int.h b/audio/audio_int.h\nindex fb5a9dd871e..bd9c7a29e41 100644\n--- a/audio/audio_int.h\n+++ b/audio/audio_int.h\n@@ -136,16 +136,6 @@ struct SWVoiceIn {\n QLIST_ENTRY (SWVoiceIn) entries;\n };\n \n-typedef struct audio_driver audio_driver;\n-struct audio_driver {\n- const char *name;\n- struct audio_pcm_ops *pcm_ops;\n- int max_voices_out;\n- int max_voices_in;\n- size_t voice_size_out;\n- size_t voice_size_in;\n-};\n-\n struct audio_pcm_ops {\n int (*init_out)(HWVoiceOut *hw, audsettings *as);\n void (*fini_out)(HWVoiceOut *hw);\n@@ -229,13 +219,17 @@ struct SWVoiceCap {\n struct AudioMixengBackendClass {\n AudioBackendClass parent_class;\n \n- audio_driver *driver;\n+ const char *name;\n+ struct audio_pcm_ops *pcm_ops;\n+ int max_voices_out;\n+ int max_voices_in;\n+ size_t voice_size_out;\n+ size_t voice_size_in;\n };\n \n struct AudioMixengBackend {\n AudioBackend parent_obj;\n \n- struct audio_driver *drv;\n Audiodev *dev;\n \n QEMUTimer *ts;\ndiff --git a/audio/audio_template.h b/audio/audio_template.h\nindex 6c2d2ad5dca..7187571c668 100644\n--- a/audio/audio_template.h\n+++ b/audio/audio_template.h\n@@ -37,41 +37,42 @@\n #endif\n \n static void glue(audio_init_nb_voices_, TYPE)(AudioMixengBackend *s,\n- struct audio_driver *drv, int min_voices)\n+ AudioMixengBackendClass *k,\n+ int min_voices)\n {\n- int max_voices = glue (drv->max_voices_, TYPE);\n- size_t voice_size = glue(drv->voice_size_, TYPE);\n+ int max_voices = glue(k->max_voices_, TYPE);\n+ size_t voice_size = glue(k->voice_size_, TYPE);\n \n- glue (s->nb_hw_voices_, TYPE) = glue(audio_get_pdo_, TYPE)(s->dev)->voices;\n- if (glue (s->nb_hw_voices_, TYPE) > max_voices) {\n+ glue(s->nb_hw_voices_, TYPE) = glue(audio_get_pdo_, TYPE)(s->dev)->voices;\n+ if (glue(s->nb_hw_voices_, TYPE) > max_voices) {\n if (!max_voices) {\n #ifdef DAC\n- dolog (\"Driver `%s' does not support \" NAME \"\\n\", drv->name);\n+ dolog(\"Driver `%s' does not support \" NAME \"\\n\", k->name);\n #endif\n } else {\n- dolog (\"Driver `%s' does not support %d \" NAME \" voices, max %d\\n\",\n- drv->name,\n- glue (s->nb_hw_voices_, TYPE),\n+ dolog(\"Driver `%s' does not support %d \" NAME \" voices, max %d\\n\",\n+ k->name,\n+ glue(s->nb_hw_voices_, TYPE),\n max_voices);\n }\n- glue (s->nb_hw_voices_, TYPE) = max_voices;\n+ glue(s->nb_hw_voices_, TYPE) = max_voices;\n }\n \n- if (glue (s->nb_hw_voices_, TYPE) < min_voices) {\n- dolog (\"Bogus number of \" NAME \" voices %d, setting to %d\\n\",\n- glue (s->nb_hw_voices_, TYPE),\n+ if (glue(s->nb_hw_voices_, TYPE) < min_voices) {\n+ dolog(\"Bogus number of \" NAME \" voices %d, setting to %d\\n\",\n+ glue(s->nb_hw_voices_, TYPE),\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- drv->name, max_voices);\n- glue (s->nb_hw_voices_, TYPE) = 0;\n+ dolog(\"drv=`%s' voice_size=0 max_voices=%d\\n\",\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- drv->name, voice_size);\n+ k->name, voice_size);\n }\n }\n \n@@ -267,29 +268,24 @@ static HW *glue(audio_pcm_hw_add_new_, TYPE)(AudioMixengBackend *s,\n struct audsettings *as)\n {\n HW *hw;\n- struct audio_driver *drv = s->drv;\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_GET_CLASS(s);\n \n- if (!glue (s->nb_hw_voices_, TYPE)) {\n+ if (!glue(s->nb_hw_voices_, TYPE)) {\n return NULL;\n }\n \n- if (audio_bug(__func__, !drv)) {\n- dolog (\"No host audio driver\\n\");\n- return NULL;\n- }\n-\n- if (audio_bug(__func__, !drv->pcm_ops)) {\n- dolog (\"Host audio driver without pcm_ops\\n\");\n+ if (audio_bug(__func__, !k->pcm_ops)) {\n+ dolog(\"No host audio driver or missing pcm_ops\\n\");\n return NULL;\n }\n \n /*\n- * Since glue(s->nb_hw_voices_, TYPE) is != 0, glue(drv->voice_size_, TYPE)\n+ * Since glue(s->nb_hw_voices_, TYPE) is != 0, glue(k->voice_size_, TYPE)\n * is guaranteed to be != 0. See the audio_init_nb_voices_* functions.\n */\n- hw = g_malloc0(glue(drv->voice_size_, TYPE));\n+ hw = g_malloc0(glue(k->voice_size_, TYPE));\n hw->s = AUDIO_MIXENG_BACKEND(object_ref(s));\n- hw->pcm_ops = drv->pcm_ops;\n+ hw->pcm_ops = k->pcm_ops;\n \n QLIST_INIT (&hw->sw_head);\n #ifdef DAC\n@@ -517,8 +513,8 @@ static SW *glue(audio_mixeng_backend_open_, TYPE) (\n goto fail;\n }\n \n- if (audio_bug(__func__, !s->drv)) {\n- dolog (\"Can not open `%s' (no host audio driver)\\n\", name);\n+ if (audio_bug(__func__, !AUDIO_MIXENG_BACKEND_GET_CLASS(s)->pcm_ops)) {\n+ dolog(\"Can not open `%s' (no host audio driver)\\n\", name);\n goto fail;\n }\n \ndiff --git a/audio/alsaaudio.c b/audio/alsaaudio.c\nindex 0c63d133496..d008ce7b627 100644\n--- a/audio/alsaaudio.c\n+++ b/audio/alsaaudio.c\n@@ -46,7 +46,6 @@ struct AudioALSA {\n AudioMixengBackend parent_obj;\n };\n \n-static struct audio_driver alsa_audio_driver;\n \n struct pollhlp {\n snd_pcm_t *handle;\n@@ -938,15 +937,6 @@ static struct audio_pcm_ops alsa_pcm_ops = {\n .enable_in = alsa_enable_in,\n };\n \n-static struct audio_driver alsa_audio_driver = {\n- .name = \"alsa\",\n- .pcm_ops = &alsa_pcm_ops,\n- .max_voices_out = INT_MAX,\n- .max_voices_in = INT_MAX,\n- .voice_size_out = sizeof (ALSAVoiceOut),\n- .voice_size_in = sizeof (ALSAVoiceIn)\n-};\n-\n static void audio_alsa_class_init(ObjectClass *klass, const void *data)\n {\n AudioBackendClass *b = AUDIO_BACKEND_CLASS(klass);\n@@ -955,7 +945,12 @@ static void audio_alsa_class_init(ObjectClass *klass, const void *data)\n audio_alsa_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));\n \n b->realize = audio_alsa_realize;\n- k->driver = &alsa_audio_driver;\n+ k->name = \"alsa\";\n+ k->pcm_ops = &alsa_pcm_ops;\n+ k->max_voices_out = INT_MAX;\n+ k->max_voices_in = INT_MAX;\n+ k->voice_size_out = sizeof(ALSAVoiceOut);\n+ k->voice_size_in = sizeof(ALSAVoiceIn);\n }\n \n static const TypeInfo audio_types[] = {\ndiff --git a/audio/audio-mixeng-be.c b/audio/audio-mixeng-be.c\nindex ee593310180..3a0a537713e 100644\n--- a/audio/audio-mixeng-be.c\n+++ b/audio/audio-mixeng-be.c\n@@ -1518,21 +1518,20 @@ static bool audio_mixeng_backend_realize(AudioBackend *abe,\n Audiodev *dev, Error **errp)\n {\n AudioMixengBackend *be = AUDIO_MIXENG_BACKEND(abe);\n- audio_driver *drv = AUDIO_MIXENG_BACKEND_GET_CLASS(be)->driver;\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_GET_CLASS(be);\n \n be->dev = dev;\n- if (!drv->pcm_ops->get_buffer_in) {\n- drv->pcm_ops->get_buffer_in = audio_generic_get_buffer_in;\n- drv->pcm_ops->put_buffer_in = audio_generic_put_buffer_in;\n+ if (!k->pcm_ops->get_buffer_in) {\n+ k->pcm_ops->get_buffer_in = audio_generic_get_buffer_in;\n+ k->pcm_ops->put_buffer_in = audio_generic_put_buffer_in;\n }\n- if (!drv->pcm_ops->get_buffer_out) {\n- drv->pcm_ops->get_buffer_out = audio_generic_get_buffer_out;\n- drv->pcm_ops->put_buffer_out = audio_generic_put_buffer_out;\n+ if (!k->pcm_ops->get_buffer_out) {\n+ k->pcm_ops->get_buffer_out = audio_generic_get_buffer_out;\n+ k->pcm_ops->put_buffer_out = audio_generic_put_buffer_out;\n }\n \n- audio_init_nb_voices_out(be, drv, 1);\n- audio_init_nb_voices_in(be, drv, 0);\n- be->drv = drv;\n+ audio_init_nb_voices_out(be, k, 1);\n+ audio_init_nb_voices_in(be, k, 0);\n \n if (be->dev->timer_period <= 0) {\n be->period_ticks = 1;\n@@ -1658,7 +1657,6 @@ static void audio_mixeng_backend_finalize(Object *obj)\n QLIST_REMOVE(hwi, entries);\n }\n \n- s->drv = NULL;\n if (s->dev) {\n qapi_free_Audiodev(s->dev);\n s->dev = NULL;\ndiff --git a/audio/dbusaudio.c b/audio/dbusaudio.c\nindex 9cc6e826b7e..82e76c41f9f 100644\n--- a/audio/dbusaudio.c\n+++ b/audio/dbusaudio.c\n@@ -61,7 +61,6 @@ struct AudioDbus {\n GHashTable *in_listeners;\n };\n \n-static struct audio_driver dbus_audio_driver;\n \n typedef struct DBusVoiceOut {\n HWVoiceOut hw;\n@@ -709,15 +708,6 @@ static struct audio_pcm_ops dbus_pcm_ops = {\n .volume_in = dbus_volume_in,\n };\n \n-static struct audio_driver dbus_audio_driver = {\n- .name = \"dbus\",\n- .pcm_ops = &dbus_pcm_ops,\n- .max_voices_out = INT_MAX,\n- .max_voices_in = INT_MAX,\n- .voice_size_out = sizeof(DBusVoiceOut),\n- .voice_size_in = sizeof(DBusVoiceIn)\n-};\n-\n static void audio_dbus_class_init(ObjectClass *klass, const void *data)\n {\n AudioBackendClass *b = AUDIO_BACKEND_CLASS(klass);\n@@ -727,7 +717,12 @@ static void audio_dbus_class_init(ObjectClass *klass, const void *data)\n \n b->realize = audio_dbus_realize;\n b->set_dbus_server = dbus_audio_set_server;\n- k->driver = &dbus_audio_driver;\n+ k->name = \"dbus\";\n+ k->pcm_ops = &dbus_pcm_ops;\n+ k->max_voices_out = INT_MAX;\n+ k->max_voices_in = INT_MAX;\n+ k->voice_size_out = sizeof(DBusVoiceOut);\n+ k->voice_size_in = sizeof(DBusVoiceIn);\n }\n \n static const TypeInfo audio_types[] = {\ndiff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c\nindex a90c348230b..e35b7fc233f 100644\n--- a/audio/dsoundaudio.c\n+++ b/audio/dsoundaudio.c\n@@ -55,7 +55,6 @@ struct AudioDsound {\n struct audsettings settings;\n };\n \n-static struct audio_driver dsound_audio_driver;\n \n /* #define DEBUG_DSOUND */\n \n@@ -685,15 +684,6 @@ static struct audio_pcm_ops dsound_pcm_ops = {\n .enable_in = dsound_enable_in,\n };\n \n-static struct audio_driver dsound_audio_driver = {\n- .name = \"dsound\",\n- .pcm_ops = &dsound_pcm_ops,\n- .max_voices_out = INT_MAX,\n- .max_voices_in = 1,\n- .voice_size_out = sizeof (DSoundVoiceOut),\n- .voice_size_in = sizeof (DSoundVoiceIn)\n-};\n-\n static void audio_dsound_class_init(ObjectClass *klass, const void *data)\n {\n AudioBackendClass *b = AUDIO_BACKEND_CLASS(klass);\n@@ -702,7 +692,12 @@ static void audio_dsound_class_init(ObjectClass *klass, const void *data)\n audio_dsound_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));\n \n b->realize = audio_dsound_realize;\n- k->driver = &dsound_audio_driver;\n+ k->name = \"dsound\";\n+ k->pcm_ops = &dsound_pcm_ops;\n+ k->max_voices_out = INT_MAX;\n+ k->max_voices_in = 1;\n+ k->voice_size_out = sizeof(DSoundVoiceOut);\n+ k->voice_size_in = sizeof(DSoundVoiceIn);\n }\n \n static const TypeInfo audio_types[] = {\ndiff --git a/audio/jackaudio.c b/audio/jackaudio.c\nindex d1bf80f8b68..7caa2ddf43f 100644\n--- a/audio/jackaudio.c\n+++ b/audio/jackaudio.c\n@@ -42,7 +42,6 @@ struct AudioJack {\n AudioMixengBackend parent_obj;\n };\n \n-static struct audio_driver jack_driver;\n \n struct QJack;\n \n@@ -668,15 +667,6 @@ static struct audio_pcm_ops jack_pcm_ops = {\n .enable_in = qjack_enable_in\n };\n \n-static struct audio_driver jack_driver = {\n- .name = \"jack\",\n- .pcm_ops = &jack_pcm_ops,\n- .max_voices_out = INT_MAX,\n- .max_voices_in = INT_MAX,\n- .voice_size_out = sizeof(QJackOut),\n- .voice_size_in = sizeof(QJackIn)\n-};\n-\n static void qjack_error(const char *msg)\n {\n dolog(\"E: %s\\n\", msg);\n@@ -691,7 +681,12 @@ static void audio_jack_class_init(ObjectClass *klass, const void *data)\n {\n AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n \n- k->driver = &jack_driver;\n+ k->name = \"jack\";\n+ k->pcm_ops = &jack_pcm_ops;\n+ k->max_voices_out = INT_MAX;\n+ k->max_voices_in = INT_MAX;\n+ k->voice_size_out = sizeof(QJackOut);\n+ k->voice_size_in = sizeof(QJackIn);\n }\n \n static const TypeInfo audio_types[] = {\ndiff --git a/audio/noaudio.c b/audio/noaudio.c\nindex 6016f516d4a..be2e2e684ce 100644\n--- a/audio/noaudio.c\n+++ b/audio/noaudio.c\n@@ -37,15 +37,6 @@ struct AudioNone {\n AudioMixengBackend parent_obj;\n };\n \n-static struct audio_driver no_audio_driver;\n-\n-static void audio_none_class_init(ObjectClass *klass, const void *data)\n-{\n- AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n-\n- k->driver = &no_audio_driver;\n-}\n-\n typedef struct NoVoiceOut {\n HWVoiceOut hw;\n RateCtl rate;\n@@ -134,14 +125,17 @@ static struct audio_pcm_ops no_pcm_ops = {\n .enable_in = no_enable_in\n };\n \n-static struct audio_driver no_audio_driver = {\n- .name = \"none\",\n- .pcm_ops = &no_pcm_ops,\n- .max_voices_out = INT_MAX,\n- .max_voices_in = INT_MAX,\n- .voice_size_out = sizeof (NoVoiceOut),\n- .voice_size_in = sizeof (NoVoiceIn)\n-};\n+static void audio_none_class_init(ObjectClass *klass, const void *data)\n+{\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+\n+ k->name = \"none\";\n+ k->pcm_ops = &no_pcm_ops;\n+ k->max_voices_out = INT_MAX;\n+ k->max_voices_in = INT_MAX;\n+ k->voice_size_out = sizeof(NoVoiceOut);\n+ k->voice_size_in = sizeof(NoVoiceIn);\n+}\n \n static const TypeInfo audio_types[] = {\n {\ndiff --git a/audio/ossaudio.c b/audio/ossaudio.c\nindex e6f8d6d41e5..0ad974e20cc 100644\n--- a/audio/ossaudio.c\n+++ b/audio/ossaudio.c\n@@ -46,7 +46,6 @@ struct AudioOss {\n AudioMixengBackend parent_obj;\n };\n \n-static struct audio_driver oss_audio_driver;\n \n #if defined OSS_GETVERSION && defined SNDCTL_DSP_POLICY\n #define USE_DSP_POLICY\n@@ -773,15 +772,6 @@ static struct audio_pcm_ops oss_pcm_ops = {\n .enable_in = oss_enable_in\n };\n \n-static struct audio_driver oss_audio_driver = {\n- .name = \"oss\",\n- .pcm_ops = &oss_pcm_ops,\n- .max_voices_out = INT_MAX,\n- .max_voices_in = INT_MAX,\n- .voice_size_out = sizeof (OSSVoiceOut),\n- .voice_size_in = sizeof (OSSVoiceIn)\n-};\n-\n static void audio_oss_class_init(ObjectClass *klass, const void *data)\n {\n AudioBackendClass *b = AUDIO_BACKEND_CLASS(klass);\n@@ -790,7 +780,12 @@ static void audio_oss_class_init(ObjectClass *klass, const void *data)\n audio_oss_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));\n \n b->realize = audio_oss_realize;\n- k->driver = &oss_audio_driver;\n+ k->name = \"oss\";\n+ k->pcm_ops = &oss_pcm_ops;\n+ k->max_voices_out = INT_MAX;\n+ k->max_voices_in = INT_MAX;\n+ k->voice_size_out = sizeof(OSSVoiceOut);\n+ k->voice_size_in = sizeof(OSSVoiceIn);\n }\n \n static const TypeInfo audio_types[] = {\ndiff --git a/audio/paaudio.c b/audio/paaudio.c\nindex 35818296282..5758050cb55 100644\n--- a/audio/paaudio.c\n+++ b/audio/paaudio.c\n@@ -16,7 +16,6 @@ OBJECT_DECLARE_SIMPLE_TYPE(AudioPa, AUDIO_PA)\n \n static AudioBackendClass *audio_pa_parent_class;\n \n-static struct audio_driver pa_audio_driver;\n \n typedef struct PAConnection {\n char *server;\n@@ -931,15 +930,6 @@ static struct audio_pcm_ops qpa_pcm_ops = {\n .volume_in = qpa_volume_in\n };\n \n-static struct audio_driver pa_audio_driver = {\n- .name = \"pa\",\n- .pcm_ops = &qpa_pcm_ops,\n- .max_voices_out = INT_MAX,\n- .max_voices_in = INT_MAX,\n- .voice_size_out = sizeof (PAVoiceOut),\n- .voice_size_in = sizeof (PAVoiceIn),\n-};\n-\n static void audio_pa_class_init(ObjectClass *klass, const void *data)\n {\n AudioBackendClass *b = AUDIO_BACKEND_CLASS(klass);\n@@ -948,7 +938,12 @@ static void audio_pa_class_init(ObjectClass *klass, const void *data)\n audio_pa_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));\n \n b->realize = audio_pa_realize;\n- k->driver = &pa_audio_driver;\n+ k->name = \"pa\";\n+ k->pcm_ops = &qpa_pcm_ops;\n+ k->max_voices_out = INT_MAX;\n+ k->max_voices_in = INT_MAX;\n+ k->voice_size_out = sizeof(PAVoiceOut);\n+ k->voice_size_in = sizeof(PAVoiceIn);\n }\n \n static const TypeInfo audio_types[] = {\ndiff --git a/audio/pwaudio.c b/audio/pwaudio.c\nindex c668ef19a3e..f7f7dfbe0ad 100644\n--- a/audio/pwaudio.c\n+++ b/audio/pwaudio.c\n@@ -44,7 +44,6 @@ struct AudioPw {\n int last_seq, pending_seq, error;\n };\n \n-static struct audio_driver pw_audio_driver;\n \n typedef struct pwvolume {\n uint32_t channels;\n@@ -840,15 +839,6 @@ static struct audio_pcm_ops qpw_pcm_ops = {\n .enable_in = qpw_enable_in\n };\n \n-static struct audio_driver pw_audio_driver = {\n- .name = \"pipewire\",\n- .pcm_ops = &qpw_pcm_ops,\n- .max_voices_out = INT_MAX,\n- .max_voices_in = INT_MAX,\n- .voice_size_out = sizeof(PWVoiceOut),\n- .voice_size_in = sizeof(PWVoiceIn),\n-};\n-\n static void audio_pw_class_init(ObjectClass *klass, const void *data)\n {\n AudioBackendClass *b = AUDIO_BACKEND_CLASS(klass);\n@@ -857,7 +847,12 @@ static void audio_pw_class_init(ObjectClass *klass, const void *data)\n audio_pw_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));\n \n b->realize = audio_pw_realize;\n- k->driver = &pw_audio_driver;\n+ k->name = \"pipewire\";\n+ k->pcm_ops = &qpw_pcm_ops;\n+ k->max_voices_out = INT_MAX;\n+ k->max_voices_in = INT_MAX;\n+ k->voice_size_out = sizeof(PWVoiceOut);\n+ k->voice_size_in = sizeof(PWVoiceIn);\n }\n \n static const TypeInfo audio_types[] = {\ndiff --git a/audio/sdlaudio.c b/audio/sdlaudio.c\nindex a1d453aa307..62f7ac8d76b 100644\n--- a/audio/sdlaudio.c\n+++ b/audio/sdlaudio.c\n@@ -50,7 +50,6 @@ struct AudioSdl {\n AudioMixengBackend parent_obj;\n };\n \n-static struct audio_driver sdl_audio_driver;\n \n typedef struct SDLVoiceOut {\n HWVoiceOut hw;\n@@ -492,15 +491,6 @@ static struct audio_pcm_ops sdl_pcm_ops = {\n .enable_in = sdl_enable_in,\n };\n \n-static struct audio_driver sdl_audio_driver = {\n- .name = \"sdl\",\n- .pcm_ops = &sdl_pcm_ops,\n- .max_voices_out = INT_MAX,\n- .max_voices_in = INT_MAX,\n- .voice_size_out = sizeof(SDLVoiceOut),\n- .voice_size_in = sizeof(SDLVoiceIn),\n-};\n-\n static void audio_sdl_class_init(ObjectClass *klass, const void *data)\n {\n AudioBackendClass *b = AUDIO_BACKEND_CLASS(klass);\n@@ -509,7 +499,12 @@ static void audio_sdl_class_init(ObjectClass *klass, const void *data)\n audio_sdl_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));\n \n b->realize = audio_sdl_realize;\n- k->driver = &sdl_audio_driver;\n+ k->name = \"sdl\";\n+ k->pcm_ops = &sdl_pcm_ops;\n+ k->max_voices_out = INT_MAX;\n+ k->max_voices_in = INT_MAX;\n+ k->voice_size_out = sizeof(SDLVoiceOut);\n+ k->voice_size_in = sizeof(SDLVoiceIn);\n }\n \n static const TypeInfo audio_types[] = {\ndiff --git a/audio/sndioaudio.c b/audio/sndioaudio.c\nindex 77685e27cb1..5cd6250775b 100644\n--- a/audio/sndioaudio.c\n+++ b/audio/sndioaudio.c\n@@ -32,14 +32,6 @@ struct AudioSndio {\n AudioMixengBackend parent_obj;\n };\n \n-static struct audio_driver sndio_audio_driver;\n-\n-static void audio_sndio_class_init(ObjectClass *klass, const void *data)\n-{\n- AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n-\n- k->driver = &sndio_audio_driver;\n-}\n \n /* default latency in microseconds if no option is set */\n #define SNDIO_LATENCY_US 50000\n@@ -551,14 +543,17 @@ static struct audio_pcm_ops sndio_pcm_ops = {\n .put_buffer_in = sndio_put_buffer_in,\n };\n \n-static struct audio_driver sndio_audio_driver = {\n- .name = \"sndio\",\n- .pcm_ops = &sndio_pcm_ops,\n- .max_voices_out = INT_MAX,\n- .max_voices_in = INT_MAX,\n- .voice_size_out = sizeof(SndioVoice),\n- .voice_size_in = sizeof(SndioVoice)\n-};\n+static void audio_sndio_class_init(ObjectClass *klass, const void *data)\n+{\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+\n+ k->name = \"sndio\";\n+ k->pcm_ops = &sndio_pcm_ops;\n+ k->max_voices_out = INT_MAX;\n+ k->max_voices_in = INT_MAX;\n+ k->voice_size_out = sizeof(SndioVoice);\n+ k->voice_size_in = sizeof(SndioVoice);\n+}\n \n static const TypeInfo audio_types[] = {\n {\ndiff --git a/audio/spiceaudio.c b/audio/spiceaudio.c\nindex cc6c5d7e287..995e0f6faa3 100644\n--- a/audio/spiceaudio.c\n+++ b/audio/spiceaudio.c\n@@ -39,8 +39,6 @@ struct AudioSpice {\n AudioMixengBackend parent_obj;\n };\n \n-static struct audio_driver spice_audio_driver;\n-\n static bool spice_audio_realize(AudioBackend *abe, Audiodev *dev, Error **errp)\n {\n if (!using_spice) {\n@@ -52,17 +50,6 @@ static bool spice_audio_realize(AudioBackend *abe, Audiodev *dev, Error **errp)\n return audio_spice_parent_class->realize(abe, dev, errp);\n }\n \n-static void audio_spice_class_init(ObjectClass *klass, const void *data)\n-{\n- AudioBackendClass *b = AUDIO_BACKEND_CLASS(klass);\n- AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n-\n- audio_spice_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));\n-\n- b->realize = spice_audio_realize;\n- k->driver = &spice_audio_driver;\n-}\n-\n #if SPICE_INTERFACE_PLAYBACK_MAJOR > 1 || SPICE_INTERFACE_PLAYBACK_MINOR >= 3\n #define LINE_OUT_SAMPLES (480 * 4)\n #else\n@@ -332,14 +319,21 @@ static struct audio_pcm_ops audio_callbacks = {\n #endif\n };\n \n-static struct audio_driver spice_audio_driver = {\n- .name = \"spice\",\n- .pcm_ops = &audio_callbacks,\n- .max_voices_out = 1,\n- .max_voices_in = 1,\n- .voice_size_out = sizeof (SpiceVoiceOut),\n- .voice_size_in = sizeof (SpiceVoiceIn),\n-};\n+static void audio_spice_class_init(ObjectClass *klass, const void *data)\n+{\n+ AudioBackendClass *b = AUDIO_BACKEND_CLASS(klass);\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+\n+ audio_spice_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));\n+\n+ b->realize = spice_audio_realize;\n+ k->name = \"spice\";\n+ k->pcm_ops = &audio_callbacks;\n+ k->max_voices_out = 1;\n+ k->max_voices_in = 1;\n+ k->voice_size_out = sizeof(SpiceVoiceOut);\n+ k->voice_size_in = sizeof(SpiceVoiceIn);\n+}\n \n static const TypeInfo audio_types[] = {\n {\ndiff --git a/audio/wavaudio.c b/audio/wavaudio.c\nindex f9a0484488b..153e50fa0be 100644\n--- a/audio/wavaudio.c\n+++ b/audio/wavaudio.c\n@@ -37,15 +37,6 @@ struct AudioWav {\n AudioMixengBackend parent_obj;\n };\n \n-static struct audio_driver wav_audio_driver;\n-\n-static void audio_wav_class_init(ObjectClass *klass, const void *data)\n-{\n- AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n-\n- k->driver = &wav_audio_driver;\n-}\n-\n typedef struct WAVVoiceOut {\n HWVoiceOut hw;\n FILE *f;\n@@ -208,14 +199,17 @@ static struct audio_pcm_ops wav_pcm_ops = {\n .enable_out = wav_enable_out,\n };\n \n-static struct audio_driver wav_audio_driver = {\n- .name = \"wav\",\n- .pcm_ops = &wav_pcm_ops,\n- .max_voices_out = 1,\n- .max_voices_in = 0,\n- .voice_size_out = sizeof (WAVVoiceOut),\n- .voice_size_in = 0\n-};\n+static void audio_wav_class_init(ObjectClass *klass, const void *data)\n+{\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+\n+ k->name = \"wav\";\n+ k->pcm_ops = &wav_pcm_ops;\n+ k->max_voices_out = 1;\n+ k->max_voices_in = 0;\n+ k->voice_size_out = sizeof(WAVVoiceOut);\n+ k->voice_size_in = 0;\n+}\n \n static const TypeInfo audio_types[] = {\n {\ndiff --git a/audio/coreaudio.m b/audio/coreaudio.m\nindex a3a0b83eb9d..e9274976f94 100644\n--- a/audio/coreaudio.m\n+++ b/audio/coreaudio.m\n@@ -41,15 +41,6 @@\n AudioMixengBackend parent_obj;\n };\n \n-static struct audio_driver coreaudio_audio_driver;\n-\n-static void audio_coreaudio_class_init(ObjectClass *klass, const void *data)\n-{\n- AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n-\n- k->driver = &coreaudio_audio_driver;\n-}\n-\n typedef struct coreaudioVoiceOut {\n HWVoiceOut hw;\n pthread_mutex_t buf_mutex;\n@@ -669,14 +660,17 @@ static void coreaudio_enable_out(HWVoiceOut *hw, bool enable)\n .enable_out = coreaudio_enable_out\n };\n \n-static struct audio_driver coreaudio_audio_driver = {\n- .name = \"coreaudio\",\n- .pcm_ops = &coreaudio_pcm_ops,\n- .max_voices_out = 1,\n- .max_voices_in = 0,\n- .voice_size_out = sizeof (coreaudioVoiceOut),\n- .voice_size_in = 0\n-};\n+static void audio_coreaudio_class_init(ObjectClass *klass, const void *data)\n+{\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+\n+ k->name = \"coreaudio\";\n+ k->pcm_ops = &coreaudio_pcm_ops;\n+ k->max_voices_out = 1;\n+ k->max_voices_in = 0;\n+ k->voice_size_out = sizeof(coreaudioVoiceOut);\n+ k->voice_size_in = 0;\n+}\n \n static const TypeInfo audio_types[] = {\n {\n", "prefixes": [ "56/85" ] }