Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2196867/?format=api
{ "id": 2196867, "url": "http://patchwork.ozlabs.org/api/patches/2196867/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260216-audio-v1-24-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-24-e676662e4514@redhat.com>", "list_archive_url": null, "date": "2026-02-16T11:15:13", "name": "[24/85] audio: add QOM module-objects for each backend", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "bd802a0ea8c3588ed328575d4eb4e1a0d0021caf", "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-24-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/2196867/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2196867/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=C8PdUXr1;\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 4fF0qz6fQQz1xwF\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 16 Feb 2026 22:27:43 +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 1vrwe8-0001ia-4T; Mon, 16 Feb 2026 06:20:08 -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 1vrwb6-0005PC-8S\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:17:08 -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 1vrwax-0007Uw-As\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:16:57 -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-459-fsMAzxRkPpSluGQ62iCFzQ-1; Mon,\n 16 Feb 2026 06:16:47 -0500", "from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12])\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 5CBCC1956067; Mon, 16 Feb 2026 11:16:45 +0000 (UTC)", "from localhost (unknown [10.45.242.26])\n by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id A515A19560A2; Mon, 16 Feb 2026 11:16:44 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1771240610;\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=C74K2tWVcweB70dhChjxmvQkDVI4wpnqhJGfVEIQrd8=;\n b=C8PdUXr1mLkfYRjz4MyMThTx0Hqo9ZGjGsXJFJHgpfLAvvMuTYWTGgvNy4PM9lSRLKfrXa\n P5aFOaoac4kLPutm/RueGn3FlYlUJqGTRHEkEurmHPaDP61GINLPyDC/FuAR2vGxJJmaFZ\n AlDwHXYICVA052xZRs4NAhT7Fp2utiA=", "X-MC-Unique": "fsMAzxRkPpSluGQ62iCFzQ-1", "X-Mimecast-MFC-AGG-ID": "fsMAzxRkPpSluGQ62iCFzQ_1771240605", "From": "=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>", "Date": "Mon, 16 Feb 2026 12:15:13 +0100", "Subject": "[PATCH 24/85] audio: add QOM module-objects for each backend", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "8bit", "Message-Id": "<20260216-audio-v1-24-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=19909;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=smnEjBnrvBGsC98f664QS0l7ipklBxQwt/RhXOMoiw8=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBpkvxPgmoGCDHhKwkRMtrN3YVWkVdtmJKNibU/O\n y/Z7rSkvSKJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaZL8TwAKCRDa6OEJdZac\n 5RL7EAC5cGq37SiM8tzzNb41iV3vydFXGj/zWzih5e0dgKaKJ3Wv2+HVTlLq/ZqblY5QiR5WJOF\n IsW0QfOk5JVBEuDAI13TzN3sdmBR6qMfWjqHMJFe5GY414+QbJvrGeXlVclH+8wXWXyyloWvOwj\n nR2nZzpCxP5NJOhr/ZKPIsHWF4+ppMyWOITA06w1x/9vV0w9SVcuDzE50PGVwoZd38AfSMxDycu\n ujaNifwFHlsh1ZlfPOCuNgdtIIXuW6BsNs8IwmsKFNqpRcal8Ys0jTHTfTOfXbRHUGYWINxRtFW\n 2nczp7kPynGDRUTy4deIo/wcRcaLz5ltEkUglavZZePD6RWD8N1p5dXgCAo8Mjdi2DUILX94IY5\n Azo9S6sMAdj/1kihumV8ba167YRIVpzc55WNX7lMnxvwYwBhjpApFM5x8XfT+FL41Jxyoscs25V\n 7kl0KIC3iQew1QiwGJfjcLVs/HG8c55WE+/Vq+eBYNKhS0RhWQwdbkH/M3iD5HYU0IDDbEQCAKS\n iP6Zz8j178c57x8iZ+4x/ElohdcIBB29L7fYa/XO2tXy/Y2A4y1AKyXCznmU5Ijcq8HnT6vD96S\n AXBoBmNGY1xKF6MovdplBE9y/QpO6gMg0TSP/77XIIxg8lqwJ8XLzKgjvTYVS94u3WH68doXCfd\n IBd82zmdNt1tFmw==", "X-Developer-Key": "i=marcandre.lureau@redhat.com; a=openpgp;\n fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5", "X-Scanned-By": "MIMEDefang 3.0 on 10.30.177.12", "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,\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 <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": "This will allow to use QOM and the dynamic object module loading.\n\nThe changes are done systematically, introducing an empty instance\nstructure that will later be filled by state with further refactoring.\n\nSigned-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>\nReviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>\nReviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>\n---\n audio/audio_int.h | 2 ++\n audio/alsaaudio.c | 27 +++++++++++++++++++++++++++\n audio/dbusaudio.c | 26 ++++++++++++++++++++++++++\n audio/dsoundaudio.c | 26 ++++++++++++++++++++++++++\n audio/jackaudio.c | 26 ++++++++++++++++++++++++++\n audio/noaudio.c | 26 ++++++++++++++++++++++++++\n audio/ossaudio.c | 26 ++++++++++++++++++++++++++\n audio/paaudio.c | 26 ++++++++++++++++++++++++++\n audio/pwaudio.c | 26 ++++++++++++++++++++++++++\n audio/sdlaudio.c | 26 ++++++++++++++++++++++++++\n audio/sndioaudio.c | 26 ++++++++++++++++++++++++++\n audio/spiceaudio.c | 26 ++++++++++++++++++++++++++\n audio/wavaudio.c | 26 ++++++++++++++++++++++++++\n audio/coreaudio.m | 26 ++++++++++++++++++++++++++\n 14 files changed, 341 insertions(+)", "diff": "diff --git a/audio/audio_int.h b/audio/audio_int.h\nindex 06f5160e8df..29f5864be69 100644\n--- a/audio/audio_int.h\n+++ b/audio/audio_int.h\n@@ -241,6 +241,8 @@ struct SWVoiceCap {\n \n struct AudioMixengBackendClass {\n AudioBackendClass parent_class;\n+\n+ audio_driver *driver;\n };\n \n struct AudioMixengBackend {\ndiff --git a/audio/alsaaudio.c b/audio/alsaaudio.c\nindex 814820e2864..ecc22d7c8f9 100644\n--- a/audio/alsaaudio.c\n+++ b/audio/alsaaudio.c\n@@ -27,6 +27,7 @@\n #include \"qemu/main-loop.h\"\n #include \"qemu/module.h\"\n #include \"qemu/audio.h\"\n+#include \"qom/object.h\"\n #include \"trace.h\"\n \n #pragma GCC diagnostic ignored \"-Waddress\"\n@@ -36,6 +37,22 @@\n \n #define DEBUG_ALSA 0\n \n+#define TYPE_AUDIO_ALSA \"audio-alsa\"\n+OBJECT_DECLARE_SIMPLE_TYPE(AudioALSA, AUDIO_ALSA)\n+\n+struct AudioALSA {\n+ AudioMixengBackend parent_obj;\n+};\n+\n+static struct audio_driver alsa_audio_driver;\n+\n+static void audio_alsa_class_init(ObjectClass *klass, const void *data)\n+{\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+\n+ k->driver = &alsa_audio_driver;\n+}\n+\n struct pollhlp {\n snd_pcm_t *handle;\n struct pollfd *pfds;\n@@ -945,8 +962,18 @@ static struct audio_driver alsa_audio_driver = {\n .voice_size_in = sizeof (ALSAVoiceIn)\n };\n \n+static const TypeInfo audio_alsa_info = {\n+ .name = TYPE_AUDIO_ALSA,\n+ .parent = TYPE_AUDIO_MIXENG_BACKEND,\n+ .instance_size = sizeof(AudioALSA),\n+ .class_init = audio_alsa_class_init,\n+};\n+\n+\n static void register_audio_alsa(void)\n {\n audio_driver_register(&alsa_audio_driver);\n+ type_register_static(&audio_alsa_info);\n }\n type_init(register_audio_alsa);\n+module_obj(TYPE_AUDIO_ALSA);\ndiff --git a/audio/dbusaudio.c b/audio/dbusaudio.c\nindex 96d4fa3f471..4d62de6d72c 100644\n--- a/audio/dbusaudio.c\n+++ b/audio/dbusaudio.c\n@@ -26,6 +26,7 @@\n #include \"qemu/error-report.h\"\n #include \"qemu/module.h\"\n #include \"qemu/dbus.h\"\n+#include \"qom/object.h\"\n \n #ifdef G_OS_UNIX\n #include <gio/gunixfdlist.h>\n@@ -44,6 +45,22 @@\n \n #define DBUS_DEFAULT_AUDIO_NSAMPLES 480\n \n+#define TYPE_AUDIO_DBUS \"audio-dbus\"\n+OBJECT_DECLARE_SIMPLE_TYPE(AudioDbus, AUDIO_DBUS)\n+\n+struct AudioDbus {\n+ AudioMixengBackend parent_obj;\n+};\n+\n+static struct audio_driver dbus_audio_driver;\n+\n+static void audio_dbus_class_init(ObjectClass *klass, const void *data)\n+{\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+\n+ k->driver = &dbus_audio_driver;\n+}\n+\n typedef struct DBusAudio {\n Audiodev *dev;\n GDBusObjectManagerServer *server;\n@@ -711,10 +728,19 @@ static struct audio_driver dbus_audio_driver = {\n .voice_size_in = sizeof(DBusVoiceIn)\n };\n \n+static const TypeInfo audio_dbus_info = {\n+ .name = TYPE_AUDIO_DBUS,\n+ .parent = TYPE_AUDIO_MIXENG_BACKEND,\n+ .instance_size = sizeof(AudioDbus),\n+ .class_init = audio_dbus_class_init,\n+};\n+\n static void register_audio_dbus(void)\n {\n audio_driver_register(&dbus_audio_driver);\n+ type_register_static(&audio_dbus_info);\n }\n type_init(register_audio_dbus);\n \n module_dep(\"ui-dbus\")\n+module_obj(TYPE_AUDIO_DBUS)\ndiff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c\nindex 7a03d1dad86..91c83dec742 100644\n--- a/audio/dsoundaudio.c\n+++ b/audio/dsoundaudio.c\n@@ -33,6 +33,7 @@\n #include \"audio_int.h\"\n #include \"qemu/module.h\"\n #include \"qapi/error.h\"\n+#include \"qom/object.h\"\n \n #include <windows.h>\n #include <mmsystem.h>\n@@ -41,6 +42,22 @@\n \n #include \"audio_win_int.h\"\n \n+#define TYPE_AUDIO_DSOUND \"audio-dsound\"\n+OBJECT_DECLARE_SIMPLE_TYPE(AudioDsound, AUDIO_DSOUND)\n+\n+struct AudioDsound {\n+ AudioMixengBackend parent_obj;\n+};\n+\n+static struct audio_driver dsound_audio_driver;\n+\n+static void audio_dsound_class_init(ObjectClass *klass, const void *data)\n+{\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+\n+ k->driver = &dsound_audio_driver;\n+}\n+\n /* #define DEBUG_DSOUND */\n \n typedef struct {\n@@ -694,8 +711,17 @@ static struct audio_driver dsound_audio_driver = {\n .voice_size_in = sizeof (DSoundVoiceIn)\n };\n \n+static const TypeInfo audio_dsound_info = {\n+ .name = TYPE_AUDIO_DSOUND,\n+ .parent = TYPE_AUDIO_MIXENG_BACKEND,\n+ .instance_size = sizeof(AudioDsound),\n+ .class_init = audio_dsound_class_init,\n+};\n+\n static void register_audio_dsound(void)\n {\n audio_driver_register(&dsound_audio_driver);\n+ type_register_static(&audio_dsound_info);\n }\n type_init(register_audio_dsound);\n+module_obj(TYPE_AUDIO_DSOUND);\ndiff --git a/audio/jackaudio.c b/audio/jackaudio.c\nindex 7a3fcaedbae..7ed2e91fcc8 100644\n--- a/audio/jackaudio.c\n+++ b/audio/jackaudio.c\n@@ -27,6 +27,7 @@\n #include \"qemu/atomic.h\"\n #include \"qemu/main-loop.h\"\n #include \"qemu/audio.h\"\n+#include \"qom/object.h\"\n \n #define AUDIO_CAP \"jack\"\n #include \"audio_int.h\"\n@@ -34,6 +35,22 @@\n #include <jack/jack.h>\n #include <jack/thread.h>\n \n+#define TYPE_AUDIO_JACK \"audio-jack\"\n+OBJECT_DECLARE_SIMPLE_TYPE(AudioJack, AUDIO_JACK)\n+\n+struct AudioJack {\n+ AudioMixengBackend parent_obj;\n+};\n+\n+static struct audio_driver jack_driver;\n+\n+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+}\n+\n struct QJack;\n \n typedef enum QJackState {\n@@ -691,10 +708,18 @@ static void qjack_info(const char *msg)\n dolog(\"I: %s\\n\", msg);\n }\n \n+static const TypeInfo audio_jack_info = {\n+ .name = TYPE_AUDIO_JACK,\n+ .parent = TYPE_AUDIO_MIXENG_BACKEND,\n+ .instance_size = sizeof(AudioJack),\n+ .class_init = audio_jack_class_init,\n+};\n+\n static void register_audio_jack(void)\n {\n qemu_mutex_init(&qjack_shutdown_lock);\n audio_driver_register(&jack_driver);\n+ type_register_static(&audio_jack_info);\n #if !defined(WIN32) && defined(CONFIG_PTHREAD_SETNAME_NP_W_TID)\n jack_set_thread_creator(qjack_thread_creator);\n #endif\n@@ -702,3 +727,4 @@ static void register_audio_jack(void)\n jack_set_info_function(qjack_info);\n }\n type_init(register_audio_jack);\n+module_obj(TYPE_AUDIO_JACK);\ndiff --git a/audio/noaudio.c b/audio/noaudio.c\nindex 4ed9d2156c5..b3305480013 100644\n--- a/audio/noaudio.c\n+++ b/audio/noaudio.c\n@@ -25,10 +25,27 @@\n #include \"qemu/osdep.h\"\n #include \"qemu/module.h\"\n #include \"qemu/audio.h\"\n+#include \"qom/object.h\"\n \n #define AUDIO_CAP \"noaudio\"\n #include \"audio_int.h\"\n \n+#define TYPE_AUDIO_NONE \"audio-none\"\n+OBJECT_DECLARE_SIMPLE_TYPE(AudioNone, AUDIO_NONE)\n+\n+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@@ -138,8 +155,17 @@ static struct audio_driver no_audio_driver = {\n .voice_size_in = sizeof (NoVoiceIn)\n };\n \n+static const TypeInfo audio_none_info = {\n+ .name = TYPE_AUDIO_NONE,\n+ .parent = TYPE_AUDIO_MIXENG_BACKEND,\n+ .instance_size = sizeof(AudioNone),\n+ .class_init = audio_none_class_init,\n+};\n+\n static void register_audio_none(void)\n {\n audio_driver_register(&no_audio_driver);\n+ type_register_static(&audio_none_info);\n }\n type_init(register_audio_none);\n+module_obj(TYPE_AUDIO_NONE);\ndiff --git a/audio/ossaudio.c b/audio/ossaudio.c\nindex 6ad20ab1876..9697f4a0beb 100644\n--- a/audio/ossaudio.c\n+++ b/audio/ossaudio.c\n@@ -30,11 +30,28 @@\n #include \"qemu/host-utils.h\"\n #include \"qapi/error.h\"\n #include \"qemu/audio.h\"\n+#include \"qom/object.h\"\n #include \"trace.h\"\n \n #define AUDIO_CAP \"oss\"\n #include \"audio_int.h\"\n \n+#define TYPE_AUDIO_OSS \"audio-oss\"\n+OBJECT_DECLARE_SIMPLE_TYPE(AudioOss, AUDIO_OSS)\n+\n+struct AudioOss {\n+ AudioMixengBackend parent_obj;\n+};\n+\n+static struct audio_driver oss_audio_driver;\n+\n+static void audio_oss_class_init(ObjectClass *klass, const void *data)\n+{\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+\n+ k->driver = &oss_audio_driver;\n+}\n+\n #if defined OSS_GETVERSION && defined SNDCTL_DSP_POLICY\n #define USE_DSP_POLICY\n #endif\n@@ -772,8 +789,17 @@ static struct audio_driver oss_audio_driver = {\n .voice_size_in = sizeof (OSSVoiceIn)\n };\n \n+static const TypeInfo audio_oss_info = {\n+ .name = TYPE_AUDIO_OSS,\n+ .parent = TYPE_AUDIO_MIXENG_BACKEND,\n+ .instance_size = sizeof(AudioOss),\n+ .class_init = audio_oss_class_init,\n+};\n+\n static void register_audio_oss(void)\n {\n audio_driver_register(&oss_audio_driver);\n+ type_register_static(&audio_oss_info);\n }\n type_init(register_audio_oss);\n+module_obj(TYPE_AUDIO_OSS);\ndiff --git a/audio/paaudio.c b/audio/paaudio.c\nindex 0c06a397195..707a6d2fb23 100644\n--- a/audio/paaudio.c\n+++ b/audio/paaudio.c\n@@ -4,12 +4,29 @@\n #include \"qemu/module.h\"\n #include \"qemu/audio.h\"\n #include \"qapi/error.h\"\n+#include \"qom/object.h\"\n \n #include <pulse/pulseaudio.h>\n \n #define AUDIO_CAP \"pulseaudio\"\n #include \"audio_int.h\"\n \n+#define TYPE_AUDIO_PA \"audio-pa\"\n+OBJECT_DECLARE_SIMPLE_TYPE(AudioPa, AUDIO_PA)\n+\n+struct AudioPa {\n+ AudioMixengBackend parent_obj;\n+};\n+\n+static struct audio_driver pa_audio_driver;\n+\n+static void audio_pa_class_init(ObjectClass *klass, const void *data)\n+{\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+\n+ k->driver = &pa_audio_driver;\n+}\n+\n typedef struct PAConnection {\n char *server;\n int refcount;\n@@ -931,8 +948,17 @@ static struct audio_driver pa_audio_driver = {\n .voice_size_in = sizeof (PAVoiceIn),\n };\n \n+static const TypeInfo audio_pa_info = {\n+ .name = TYPE_AUDIO_PA,\n+ .parent = TYPE_AUDIO_MIXENG_BACKEND,\n+ .instance_size = sizeof(AudioPa),\n+ .class_init = audio_pa_class_init,\n+};\n+\n static void register_audio_pa(void)\n {\n audio_driver_register(&pa_audio_driver);\n+ type_register_static(&audio_pa_info);\n }\n type_init(register_audio_pa);\n+module_obj(TYPE_AUDIO_PA);\ndiff --git a/audio/pwaudio.c b/audio/pwaudio.c\nindex 30f717ccacf..31f8899d1ed 100644\n--- a/audio/pwaudio.c\n+++ b/audio/pwaudio.c\n@@ -13,6 +13,7 @@\n #include \"qemu/audio.h\"\n #include \"qemu/error-report.h\"\n #include \"qapi/error.h\"\n+#include \"qom/object.h\"\n #include <spa/param/audio/format-utils.h>\n #include <spa/utils/ringbuffer.h>\n #include <spa/utils/result.h>\n@@ -27,6 +28,22 @@\n \n #include \"audio_int.h\"\n \n+#define TYPE_AUDIO_PW \"audio-pipewire\"\n+OBJECT_DECLARE_SIMPLE_TYPE(AudioPw, AUDIO_PW)\n+\n+struct AudioPw {\n+ AudioMixengBackend parent_obj;\n+};\n+\n+static struct audio_driver pw_audio_driver;\n+\n+static void audio_pw_class_init(ObjectClass *klass, const void *data)\n+{\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+\n+ k->driver = &pw_audio_driver;\n+}\n+\n typedef struct pwvolume {\n uint32_t channels;\n float values[SPA_AUDIO_MAX_CHANNELS];\n@@ -847,10 +864,19 @@ static struct audio_driver pw_audio_driver = {\n .voice_size_in = sizeof(PWVoiceIn),\n };\n \n+static const TypeInfo audio_pw_info = {\n+ .name = TYPE_AUDIO_PW,\n+ .parent = TYPE_AUDIO_MIXENG_BACKEND,\n+ .instance_size = sizeof(AudioPw),\n+ .class_init = audio_pw_class_init,\n+};\n+\n static void\n register_audio_pw(void)\n {\n audio_driver_register(&pw_audio_driver);\n+ type_register_static(&audio_pw_info);\n }\n \n type_init(register_audio_pw);\n+module_obj(TYPE_AUDIO_PW);\ndiff --git a/audio/sdlaudio.c b/audio/sdlaudio.c\nindex 707110973ac..5841e131cc0 100644\n--- a/audio/sdlaudio.c\n+++ b/audio/sdlaudio.c\n@@ -28,6 +28,7 @@\n #include \"qemu/module.h\"\n #include \"qapi/error.h\"\n #include \"qemu/audio.h\"\n+#include \"qom/object.h\"\n \n #ifndef _WIN32\n #ifdef __sun__\n@@ -40,6 +41,22 @@\n #define AUDIO_CAP \"sdl\"\n #include \"audio_int.h\"\n \n+#define TYPE_AUDIO_SDL \"audio-sdl\"\n+OBJECT_DECLARE_SIMPLE_TYPE(AudioSdl, AUDIO_SDL)\n+\n+struct AudioSdl {\n+ AudioMixengBackend parent_obj;\n+};\n+\n+static struct audio_driver sdl_audio_driver;\n+\n+static void audio_sdl_class_init(ObjectClass *klass, const void *data)\n+{\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+\n+ k->driver = &sdl_audio_driver;\n+}\n+\n typedef struct SDLVoiceOut {\n HWVoiceOut hw;\n int exit;\n@@ -491,8 +508,17 @@ static struct audio_driver sdl_audio_driver = {\n .voice_size_in = sizeof(SDLVoiceIn),\n };\n \n+static const TypeInfo audio_sdl_info = {\n+ .name = TYPE_AUDIO_SDL,\n+ .parent = TYPE_AUDIO_MIXENG_BACKEND,\n+ .instance_size = sizeof(AudioSdl),\n+ .class_init = audio_sdl_class_init,\n+};\n+\n static void register_audio_sdl(void)\n {\n audio_driver_register(&sdl_audio_driver);\n+ type_register_static(&audio_sdl_info);\n }\n type_init(register_audio_sdl);\n+module_obj(TYPE_AUDIO_SDL);\ndiff --git a/audio/sndioaudio.c b/audio/sndioaudio.c\nindex 8197b8b0b47..7f388b498f6 100644\n--- a/audio/sndioaudio.c\n+++ b/audio/sndioaudio.c\n@@ -20,10 +20,27 @@\n #include \"qemu/main-loop.h\"\n #include \"qemu/audio.h\"\n #include \"trace.h\"\n+#include \"qom/object.h\"\n \n #define AUDIO_CAP \"sndio\"\n #include \"audio_int.h\"\n \n+#define TYPE_AUDIO_SNDIO \"audio-sndio\"\n+OBJECT_DECLARE_SIMPLE_TYPE(AudioSndio, AUDIO_SNDIO)\n+\n+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 \n@@ -555,9 +572,18 @@ static struct audio_driver sndio_audio_driver = {\n .voice_size_in = sizeof(SndioVoice)\n };\n \n+static const TypeInfo audio_sndio_info = {\n+ .name = TYPE_AUDIO_SNDIO,\n+ .parent = TYPE_AUDIO_MIXENG_BACKEND,\n+ .instance_size = sizeof(AudioSndio),\n+ .class_init = audio_sndio_class_init,\n+};\n+\n static void register_audio_sndio(void)\n {\n audio_driver_register(&sndio_audio_driver);\n+ type_register_static(&audio_sndio_info);\n }\n \n type_init(register_audio_sndio);\n+module_obj(TYPE_AUDIO_SNDIO);\ndiff --git a/audio/spiceaudio.c b/audio/spiceaudio.c\nindex 7db2d1f0dfd..d0bcc0836ad 100644\n--- a/audio/spiceaudio.c\n+++ b/audio/spiceaudio.c\n@@ -24,11 +24,28 @@\n #include \"qemu/timer.h\"\n #include \"qapi/error.h\"\n #include \"ui/qemu-spice.h\"\n+#include \"qom/object.h\"\n \n #define AUDIO_CAP \"spice\"\n #include \"qemu/audio.h\"\n #include \"audio_int.h\"\n \n+#define TYPE_AUDIO_SPICE \"audio-spice\"\n+OBJECT_DECLARE_SIMPLE_TYPE(AudioSpice, AUDIO_SPICE)\n+\n+struct AudioSpice {\n+ AudioMixengBackend parent_obj;\n+};\n+\n+static struct audio_driver spice_audio_driver;\n+\n+static void audio_spice_class_init(ObjectClass *klass, const void *data)\n+{\n+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+\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@@ -325,10 +342,19 @@ static struct audio_driver spice_audio_driver = {\n .voice_size_in = sizeof (SpiceVoiceIn),\n };\n \n+static const TypeInfo audio_spice_info = {\n+ .name = TYPE_AUDIO_SPICE,\n+ .parent = TYPE_AUDIO_MIXENG_BACKEND,\n+ .instance_size = sizeof(AudioSpice),\n+ .class_init = audio_spice_class_init,\n+};\n+\n static void register_audio_spice(void)\n {\n audio_driver_register(&spice_audio_driver);\n+ type_register_static(&audio_spice_info);\n }\n type_init(register_audio_spice);\n+module_obj(TYPE_AUDIO_SPICE);\n \n module_dep(\"ui-spice-core\");\ndiff --git a/audio/wavaudio.c b/audio/wavaudio.c\nindex 46460a5d573..00cf110ecd7 100644\n--- a/audio/wavaudio.c\n+++ b/audio/wavaudio.c\n@@ -25,10 +25,27 @@\n #include \"qemu/osdep.h\"\n #include \"qemu/module.h\"\n #include \"qemu/audio.h\"\n+#include \"qom/object.h\"\n \n #define AUDIO_CAP \"wav\"\n #include \"audio_int.h\"\n \n+#define TYPE_AUDIO_WAV \"audio-wav\"\n+OBJECT_DECLARE_SIMPLE_TYPE(AudioWav, AUDIO_WAV)\n+\n+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@@ -214,8 +231,17 @@ static struct audio_driver wav_audio_driver = {\n .voice_size_in = 0\n };\n \n+static const TypeInfo audio_wav_info = {\n+ .name = TYPE_AUDIO_WAV,\n+ .parent = TYPE_AUDIO_MIXENG_BACKEND,\n+ .instance_size = sizeof(AudioWav),\n+ .class_init = audio_wav_class_init,\n+};\n+\n static void register_audio_wav(void)\n {\n audio_driver_register(&wav_audio_driver);\n+ type_register_static(&audio_wav_info);\n }\n type_init(register_audio_wav);\n+module_obj(TYPE_AUDIO_WAV);\ndiff --git a/audio/coreaudio.m b/audio/coreaudio.m\nindex 997017a1e96..61333e9f2f9 100644\n--- a/audio/coreaudio.m\n+++ b/audio/coreaudio.m\n@@ -29,10 +29,27 @@\n #include \"qemu/main-loop.h\"\n #include \"qemu/module.h\"\n #include \"qemu/audio.h\"\n+#include \"qom/object.h\"\n \n #define AUDIO_CAP \"coreaudio\"\n #include \"audio_int.h\"\n \n+#define TYPE_AUDIO_COREAUDIO \"audio-coreaudio\"\n+OBJECT_DECLARE_SIMPLE_TYPE(AudioCoreaudio, AUDIO_COREAUDIO)\n+\n+struct AudioCoreaudio {\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@@ -673,8 +690,17 @@ static void coreaudio_audio_fini (void *opaque)\n .voice_size_in = 0\n };\n \n+static const TypeInfo audio_coreaudio_info = {\n+ .name = TYPE_AUDIO_COREAUDIO,\n+ .parent = TYPE_AUDIO_MIXENG_BACKEND,\n+ .instance_size = sizeof(AudioCoreaudio),\n+ .class_init = audio_coreaudio_class_init,\n+};\n+\n static void register_audio_coreaudio(void)\n {\n audio_driver_register(&coreaudio_audio_driver);\n+ type_register_static(&audio_coreaudio_info);\n }\n type_init(register_audio_coreaudio);\n+module_obj(TYPE_AUDIO_COREAUDIO);\n", "prefixes": [ "24/85" ] }