Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2196804/?format=api
{ "id": 2196804, "url": "http://patchwork.ozlabs.org/api/patches/2196804/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260216-audio-v1-29-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-29-e676662e4514@redhat.com>", "list_archive_url": null, "date": "2026-02-16T11:15:18", "name": "[29/85] audio: replace type_init() with DEFINE_TYPES", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "e0c4ad97d65dfb08335bbb024019ed9dee75cc46", "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-29-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/2196804/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2196804/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=D9AUBATo;\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 4fF0gF2gn8z1xpY\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 16 Feb 2026 22:20:09 +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 1vrwe4-0001Me-5g; Mon, 16 Feb 2026 06:20:04 -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 1vrwbO-0005c9-QE\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:17:24 -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 1vrwbJ-0007hT-Uv\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:17:17 -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-97-TVTG2A9MMSOzqy6JBVlDGQ-1; Mon,\n 16 Feb 2026 06:17:01 -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 57EA119560B2; Mon, 16 Feb 2026 11:16:59 +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 13AB130001B9; Mon, 16 Feb 2026 11:16:57 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1771240624;\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=U0bHWW5dgK+/HJjVU+OAOt9u9O6Cx3FhrDkXc/laulI=;\n b=D9AUBAToeDykvv5IQOg+DEJ9Z4Qg1ldgfY1oR7AVGVTZ29v6ZADKxmTVBFs2oxT/uU3K93\n gF36TUPMVY5QQDgiYIuDoyW9TiYygMwzK6YnuoYZRZZYxlkrZTmB1RDBH7WMtiBx1kZdOs\n ZeVrRQvuOwPawbXDVGxCpujbXyz13Z0=", "X-MC-Unique": "TVTG2A9MMSOzqy6JBVlDGQ-1", "X-Mimecast-MFC-AGG-ID": "TVTG2A9MMSOzqy6JBVlDGQ_1771240619", "From": "=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>", "Date": "Mon, 16 Feb 2026 12:15:18 +0100", "Subject": "[PATCH 29/85] audio: replace type_init() with DEFINE_TYPES", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "8bit", "Message-Id": "<20260216-audio-v1-29-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>", "X-Developer-Signature": "v=1; a=openpgp-sha256; l=12925;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=/OclfmP5XewpxJNnSJDp4/Un0I4vQMcL2p0K7RiWt4g=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBpkvxPzq1tH1Qld4toiGW9FYMLYpn54fKwAT0rU\n t4x/7ROkeuJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaZL8TwAKCRDa6OEJdZac\n 5XZ5D/92BWDs6BYjDg87G45/PgA62LTJsOjfYla3IWwsajkwczYlhI7uPJ5UromLxFIX8caU8hY\n 0qcuok4XsErMv0/pP6E7mpiwpnwwdUPPIBZQjTtM6RKte3xpcVFbNqDZ81RE13vrC4sajh4r71+\n Pf7s0lvB5r59HOEW5qxQOlolKDyfHxofNWHdhYH08vwlAg/2fpRl8SCtgZqQ1urSEZgX1WjrQig\n ZytPyiyuc9NY1vgwMCZebFPcA8tCYRVW1LUaYeMswPG2i4VYwUOFhwjYbnKntDk8M4xBOCx1+5f\n w4wHmFYqFAxo0h0KwL9jB9aJpiOf0bQXw6OBZe7EO6y/pM5fwNS2oe1Vr0YVcQgS+aa0CPkVv5C\n w2Wkl2scangyq9W54eKBhu+y2FD96PYVUEBaFGUABj3pMhzADEOsRvzwTNBKgaHpbgC1xACt3FH\n EDpY1BstbEyMR/w97IzuzUdPPdtsd4oFLvkTe4sRVtXz1zxCml5qJbbff5fGbjZnIL5uWZZxn8i\n RmjH0upZzn9bWl+ud5hPXMyId3OJ+OyBIXaqZ8D1boiuVU3Jp2On0u/txT1Ad069DRr+3FOZfvs\n gEJxDqEJpzuLtDQC7dQGQ5VUTkf3Xd8BnLqg9z5E1M5Sx2Jai9jpO0OM/Dvj5lrEpi+q1TzTwqW\n FUG5mus6sXQUtGg==", "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": "Use the convenience macro to register types.\n\nNote that jack backend was using the type registration to initialize\nsome globals. Use a ctor function instead.\n\nSigned-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>\n---\n audio/alsaaudio.c | 19 ++++++++-----------\n audio/dbusaudio.c | 18 ++++++++----------\n audio/dsoundaudio.c | 18 ++++++++----------\n audio/jackaudio.c | 18 ++++++++++--------\n audio/noaudio.c | 18 ++++++++----------\n audio/ossaudio.c | 18 ++++++++----------\n audio/paaudio.c | 18 ++++++++----------\n audio/pwaudio.c | 20 ++++++++------------\n audio/sdlaudio.c | 18 ++++++++----------\n audio/sndioaudio.c | 19 ++++++++-----------\n audio/spiceaudio.c | 18 ++++++++----------\n audio/wavaudio.c | 18 ++++++++----------\n audio/coreaudio.m | 18 ++++++++----------\n 13 files changed, 106 insertions(+), 132 deletions(-)", "diff": "diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c\nindex 7200777ad82..ae1cec6a36e 100644\n--- a/audio/alsaaudio.c\n+++ b/audio/alsaaudio.c\n@@ -962,17 +962,14 @@ 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+static const TypeInfo audio_types[] = {\n+ {\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-\n-static void register_audio_alsa(void)\n-{\n- type_register_static(&audio_alsa_info);\n-}\n-type_init(register_audio_alsa);\n+DEFINE_TYPES(audio_types)\n module_obj(TYPE_AUDIO_ALSA);\ndiff --git a/audio/dbusaudio.c b/audio/dbusaudio.c\nindex 48c9078d80e..269db7877b6 100644\n--- a/audio/dbusaudio.c\n+++ b/audio/dbusaudio.c\n@@ -729,18 +729,16 @@ static void audio_dbus_class_init(ObjectClass *klass, const void *data)\n k->driver = &dbus_audio_driver;\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+static const TypeInfo audio_types[] = {\n+ {\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 \n-static void register_audio_dbus(void)\n-{\n- type_register_static(&audio_dbus_info);\n-}\n-type_init(register_audio_dbus);\n+DEFINE_TYPES(audio_types)\n \n module_dep(\"ui-dbus\")\n module_obj(TYPE_AUDIO_DBUS)\ndiff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c\nindex 6d213899660..462d09e02af 100644\n--- a/audio/dsoundaudio.c\n+++ b/audio/dsoundaudio.c\n@@ -711,16 +711,14 @@ 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+static const TypeInfo audio_types[] = {\n+ {\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 \n-static void register_audio_dsound(void)\n-{\n- type_register_static(&audio_dsound_info);\n-}\n-type_init(register_audio_dsound);\n+DEFINE_TYPES(audio_types)\n module_obj(TYPE_AUDIO_DSOUND);\ndiff --git a/audio/jackaudio.c b/audio/jackaudio.c\nindex bfce4cb0b4c..972b158f023 100644\n--- a/audio/jackaudio.c\n+++ b/audio/jackaudio.c\n@@ -708,22 +708,24 @@ 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+static const TypeInfo audio_types[] = {\n+ {\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 \n-static void register_audio_jack(void)\n+static void __attribute__((__constructor__)) audio_jack_init(void)\n {\n qemu_mutex_init(&qjack_shutdown_lock);\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 jack_set_error_function(qjack_error);\n jack_set_info_function(qjack_info);\n }\n-type_init(register_audio_jack);\n+\n+DEFINE_TYPES(audio_types)\n module_obj(TYPE_AUDIO_JACK);\ndiff --git a/audio/noaudio.c b/audio/noaudio.c\nindex 8b5ebd71bf6..65679b8b13d 100644\n--- a/audio/noaudio.c\n+++ b/audio/noaudio.c\n@@ -155,16 +155,14 @@ 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+static const TypeInfo audio_types[] = {\n+ {\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 \n-static void register_audio_none(void)\n-{\n- type_register_static(&audio_none_info);\n-}\n-type_init(register_audio_none);\n+DEFINE_TYPES(audio_types)\n module_obj(TYPE_AUDIO_NONE);\ndiff --git a/audio/ossaudio.c b/audio/ossaudio.c\nindex b8e26b17ed7..f64c564e345 100644\n--- a/audio/ossaudio.c\n+++ b/audio/ossaudio.c\n@@ -789,16 +789,14 @@ 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+static const TypeInfo audio_types[] = {\n+ {\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 \n-static void register_audio_oss(void)\n-{\n- type_register_static(&audio_oss_info);\n-}\n-type_init(register_audio_oss);\n+DEFINE_TYPES(audio_types)\n module_obj(TYPE_AUDIO_OSS);\ndiff --git a/audio/paaudio.c b/audio/paaudio.c\nindex adaeb2af807..331da4f2ed6 100644\n--- a/audio/paaudio.c\n+++ b/audio/paaudio.c\n@@ -948,16 +948,14 @@ 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+static const TypeInfo audio_types[] = {\n+ {\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 \n-static void register_audio_pa(void)\n-{\n- type_register_static(&audio_pa_info);\n-}\n-type_init(register_audio_pa);\n+DEFINE_TYPES(audio_types)\n module_obj(TYPE_AUDIO_PA);\ndiff --git a/audio/pwaudio.c b/audio/pwaudio.c\nindex facd166052c..3b524dfea5a 100644\n--- a/audio/pwaudio.c\n+++ b/audio/pwaudio.c\n@@ -864,18 +864,14 @@ 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+static const TypeInfo audio_types[] = {\n+ {\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 \n-static void\n-register_audio_pw(void)\n-{\n- type_register_static(&audio_pw_info);\n-}\n-\n-type_init(register_audio_pw);\n+DEFINE_TYPES(audio_types)\n module_obj(TYPE_AUDIO_PW);\ndiff --git a/audio/sdlaudio.c b/audio/sdlaudio.c\nindex c00f1366d17..a60b1629da0 100644\n--- a/audio/sdlaudio.c\n+++ b/audio/sdlaudio.c\n@@ -508,16 +508,14 @@ 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+static const TypeInfo audio_types[] = {\n+ {\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 \n-static void register_audio_sdl(void)\n-{\n- type_register_static(&audio_sdl_info);\n-}\n-type_init(register_audio_sdl);\n+DEFINE_TYPES(audio_types)\n module_obj(TYPE_AUDIO_SDL);\ndiff --git a/audio/sndioaudio.c b/audio/sndioaudio.c\nindex c8310b1fa37..2a9ae42992b 100644\n--- a/audio/sndioaudio.c\n+++ b/audio/sndioaudio.c\n@@ -572,17 +572,14 @@ 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+static const TypeInfo audio_types[] = {\n+ {\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 \n-static void register_audio_sndio(void)\n-{\n- type_register_static(&audio_sndio_info);\n-}\n-\n-type_init(register_audio_sndio);\n+DEFINE_TYPES(audio_types)\n module_obj(TYPE_AUDIO_SNDIO);\ndiff --git a/audio/spiceaudio.c b/audio/spiceaudio.c\nindex d1bb318b6b7..ad7cb69673b 100644\n--- a/audio/spiceaudio.c\n+++ b/audio/spiceaudio.c\n@@ -342,18 +342,16 @@ 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+static const TypeInfo audio_types[] = {\n+ {\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 \n-static void register_audio_spice(void)\n-{\n- type_register_static(&audio_spice_info);\n-}\n-type_init(register_audio_spice);\n+DEFINE_TYPES(audio_types)\n module_obj(TYPE_AUDIO_SPICE);\n \n module_dep(\"ui-spice-core\");\ndiff --git a/audio/wavaudio.c b/audio/wavaudio.c\nindex 12d4108ffad..cd2ceffd42b 100644\n--- a/audio/wavaudio.c\n+++ b/audio/wavaudio.c\n@@ -231,16 +231,14 @@ 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+static const TypeInfo audio_types[] = {\n+ {\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 \n-static void register_audio_wav(void)\n-{\n- type_register_static(&audio_wav_info);\n-}\n-type_init(register_audio_wav);\n+DEFINE_TYPES(audio_types)\n module_obj(TYPE_AUDIO_WAV);\ndiff --git a/audio/coreaudio.m b/audio/coreaudio.m\nindex 5efd16df7c4..862cb9dd9b0 100644\n--- a/audio/coreaudio.m\n+++ b/audio/coreaudio.m\n@@ -690,16 +690,14 @@ 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+static const TypeInfo audio_types[] = {\n+ {\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 \n-static void register_audio_coreaudio(void)\n-{\n- type_register_static(&audio_coreaudio_info);\n-}\n-type_init(register_audio_coreaudio);\n+DEFINE_TYPES(audio_types)\n module_obj(TYPE_AUDIO_COREAUDIO);\n", "prefixes": [ "29/85" ] }