Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2196873/?format=api
{ "id": 2196873, "url": "http://patchwork.ozlabs.org/api/patches/2196873/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260216-audio-v1-50-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-50-e676662e4514@redhat.com>", "list_archive_url": null, "date": "2026-02-16T11:15:39", "name": "[50/85] audio/pw: convert to QOM lifecycle methods", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "8397cf5536f17506e83598ac3034515ed5061c23", "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-50-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/2196873/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2196873/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=W2W/Y3vt;\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 4fF0st2SvSz1xwF\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 16 Feb 2026 22:29:22 +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 1vrwfO-0006Ze-90; Mon, 16 Feb 2026 06:21:26 -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 1vrwcA-0006UA-RP\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:18:09 -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 <marcandre.lureau@redhat.com>)\n id 1vrwc8-0008BV-SN\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:18:06 -0500", "from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-436--wvVxrslPou7Q_UZU69iHg-1; Mon,\n 16 Feb 2026 06:18:00 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 1CECF18004BB; Mon, 16 Feb 2026 11:17:58 +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 5A74E30001A5; Mon, 16 Feb 2026 11:17:57 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1771240684;\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=JxdTNnVEA5dLWdTaaPYS9EB7LtH7sy5sV7cgK+yuVqQ=;\n b=W2W/Y3vtlCdsK9xJu0mKnxCIInXIfgrnpPco15/eW7/XmQeXMyTzUMNWWT4syM/RyTUfNB\n KsZjp/zLrCZtoeG+5Z+6kWv9Ck4RNDZOT2HVMsrqQzHqdJAuW3SmGnrcrFZ8oG0mUvLcYk\n rphm96pzKabqL4htyMsMY2VUaEteig8=", "X-MC-Unique": "-wvVxrslPou7Q_UZU69iHg-1", "X-Mimecast-MFC-AGG-ID": "-wvVxrslPou7Q_UZU69iHg_1771240678", "From": "=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>", "Date": "Mon, 16 Feb 2026 12:15:39 +0100", "Subject": "[PATCH 50/85] audio/pw: convert to QOM lifecycle methods", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "8bit", "Message-Id": "<20260216-audio-v1-50-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=12053;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=bH5+vNyDDwdZkNy3frawvDWH6mwupPcSpMoXcje0aDk=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBpkvxQJ/hD0x7wGCiHDqWdVH3+569qWFB7r8MYE\n AFOV0C5zOiJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaZL8UAAKCRDa6OEJdZac\n 5dJ4D/0eBJ519OUSgb8YMQ6AUwynOBk6buTKswp2KglOQu3mliBl8Y/o8F2p6hRvLMWgWhTxrGx\n i6M8wAhBb91KQLmNlotztvgoRGQwoee38u4ROs6+5kYPB+e7zl2OElxDH5bNgR1132f8bmDHjzT\n 61P3Dkrb7BsD121mEA4OSO4zitDuW7VRlbrcNnUcvU+6roRIB5aU9hYx/juk6gWI5SeEJbX5Zba\n RoxRRMLMy/DWRazbVuVnJnxYTXh6wM49pdvt+VaIJqW5krUm+YfQiGzOW/J7zJGtfvzCG2R47bp\n z9aGuz6aOSBkXRxRVLeAU1xj4I5kmKBsKWM7ZfROtj0670V5AY5BilxFPg36rlOFrFx0XqYxmrF\n 7NWbABgXpAiMHI7rhI1A+b9M3xwYJ3b1MhEz2dsWf36OEiNkond1TYUbokkINqe2T2CpeS2FymV\n FU2D/WdjkMONAp/NKnxNPuIL68lyxu3mt9C2rRDJmLewrqftCftVFIPRkuz1RDo8LXAnpmm8fHG\n ZzMNIg9Y9b91aBogU3ML7CYPdl2YgOrNIfcx8FRi7AOQi5lValcnh0fSyA4kWHnMdUp6FlyGelU\n VJ2DgmurlxTTq1yyUgrIHPWrXUsY1VGIdjTg7BggemNZ3KSjj9zdPkAmwml6bV9BpVO3St4k6Tw\n O2HmGJy61t2JOZQ==", "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 <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": "Migrate the PipeWire audio backend from the legacy driver init/fini\ncallbacks to proper QOM realize and finalize methods.\n\nThe pwaudio struct fields are now embedded directly in the AudioPw\nQOM object instead of being allocated separately as drv_opaque. This\nallows accessing the backend state through proper QOM type casting\nwith AUDIO_PW() rather than casting drv_opaque pointers.\n\nThe PipeWire thread loop and context are now managed through the QOM\nlifecycle, with initialization in realize and cleanup in finalize.\n\nSigned-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>\nReviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>\n---\n audio/pwaudio.c | 119 +++++++++++++++++++++++++++-----------------------------\n 1 file changed, 58 insertions(+), 61 deletions(-)", "diff": "diff --git a/audio/pwaudio.c b/audio/pwaudio.c\nindex 3b524dfea5a..ca61a1b4ef5 100644\n--- a/audio/pwaudio.c\n+++ b/audio/pwaudio.c\n@@ -31,36 +31,27 @@\n #define TYPE_AUDIO_PW \"audio-pipewire\"\n OBJECT_DECLARE_SIMPLE_TYPE(AudioPw, AUDIO_PW)\n \n+static AudioBackendClass *audio_pw_parent_class;\n+\n struct AudioPw {\n AudioMixengBackend parent_obj;\n-};\n \n-static struct audio_driver pw_audio_driver;\n+ struct pw_thread_loop *thread_loop;\n+ struct pw_context *context;\n \n-static void audio_pw_class_init(ObjectClass *klass, const void *data)\n-{\n- AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+ struct pw_core *core;\n+ struct spa_hook core_listener;\n+ int last_seq, pending_seq, error;\n+};\n \n- k->driver = &pw_audio_driver;\n-}\n+static struct audio_driver pw_audio_driver;\n \n typedef struct pwvolume {\n uint32_t channels;\n float values[SPA_AUDIO_MAX_CHANNELS];\n } pwvolume;\n \n-typedef struct pwaudio {\n- Audiodev *dev;\n- struct pw_thread_loop *thread_loop;\n- struct pw_context *context;\n-\n- struct pw_core *core;\n- struct spa_hook core_listener;\n- int last_seq, pending_seq, error;\n-} pwaudio;\n-\n typedef struct PWVoice {\n- pwaudio *g;\n struct pw_stream *stream;\n struct spa_hook stream_listener;\n struct spa_audio_info_raw info;\n@@ -236,9 +227,9 @@ static const struct pw_stream_events playback_stream_events = {\n static size_t\n qpw_read(HWVoiceIn *hw, void *data, size_t len)\n {\n+ AudioPw *c = AUDIO_PW(hw->s);\n PWVoiceIn *pw = (PWVoiceIn *) hw;\n PWVoice *v = &pw->v;\n- pwaudio *c = v->g;\n const char *error = NULL;\n size_t l;\n int32_t avail;\n@@ -273,9 +264,9 @@ done_unlock:\n \n static size_t qpw_buffer_get_free(HWVoiceOut *hw)\n {\n+ AudioPw *c = AUDIO_PW(hw->s);\n PWVoiceOut *pw = (PWVoiceOut *)hw;\n PWVoice *v = &pw->v;\n- pwaudio *c = v->g;\n const char *error = NULL;\n int32_t filled, avail;\n uint32_t index;\n@@ -298,9 +289,9 @@ done_unlock:\n static size_t\n qpw_write(HWVoiceOut *hw, void *data, size_t len)\n {\n+ AudioPw *c = AUDIO_PW(hw->s);\n PWVoiceOut *pw = (PWVoiceOut *) hw;\n PWVoice *v = &pw->v;\n- pwaudio *c = v->g;\n const char *error = NULL;\n int32_t filled, avail;\n uint32_t index;\n@@ -434,7 +425,7 @@ pw_to_audfmt(enum spa_audio_format fmt, int *endianness,\n }\n \n static int\n-qpw_stream_new(pwaudio *c, PWVoice *v, const char *stream_name,\n+qpw_stream_new(AudioPw *c, PWVoice *v, const char *stream_name,\n const char *name, enum spa_direction dir)\n {\n int res;\n@@ -452,8 +443,8 @@ qpw_stream_new(pwaudio *c, PWVoice *v, const char *stream_name,\n }\n \n /* 75% of the timer period for faster updates */\n- buf_samples = (uint64_t)v->g->dev->timer_period * v->info.rate\n- * 3 / 4 / 1000000;\n+ buf_samples = (uint64_t)AUDIO_MIXENG_BACKEND(c)->dev->timer_period\n+ * v->info.rate * 3 / 4 / 1000000;\n pw_properties_setf(props, PW_KEY_NODE_LATENCY, \"%\" PRIu64 \"/%u\",\n buf_samples, v->info.rate);\n \n@@ -535,11 +526,11 @@ qpw_set_position(uint32_t channels, uint32_t position[SPA_AUDIO_MAX_CHANNELS])\n static int\n qpw_init_out(HWVoiceOut *hw, struct audsettings *as, void *drv_opaque)\n {\n+ AudioPw *c = AUDIO_PW(hw->s);\n PWVoiceOut *pw = (PWVoiceOut *) hw;\n PWVoice *v = &pw->v;\n struct audsettings obt_as = *as;\n- pwaudio *c = v->g = drv_opaque;\n- AudiodevPipewireOptions *popts = &c->dev->u.pipewire;\n+ AudiodevPipewireOptions *popts = &AUDIO_MIXENG_BACKEND(c)->dev->u.pipewire;\n AudiodevPipewirePerDirectionOptions *ppdo = popts->out;\n int r;\n \n@@ -554,11 +545,11 @@ qpw_init_out(HWVoiceOut *hw, struct audsettings *as, void *drv_opaque)\n pw_to_audfmt(v->info.format, &obt_as.endianness, &v->frame_size);\n v->frame_size *= as->nchannels;\n \n- v->req = (uint64_t)c->dev->timer_period * v->info.rate\n+ v->req = (uint64_t)AUDIO_MIXENG_BACKEND(c)->dev->timer_period * v->info.rate\n * 1 / 2 / 1000000 * v->frame_size;\n \n /* call the function that creates a new stream for playback */\n- r = qpw_stream_new(c, v, ppdo->stream_name ? : c->dev->id,\n+ r = qpw_stream_new(c, v, ppdo->stream_name ?: AUDIO_MIXENG_BACKEND(c)->dev->id,\n ppdo->name, SPA_DIRECTION_OUTPUT);\n if (r < 0) {\n pw_thread_loop_unlock(c->thread_loop);\n@@ -582,11 +573,11 @@ qpw_init_out(HWVoiceOut *hw, struct audsettings *as, void *drv_opaque)\n static int\n qpw_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)\n {\n+ AudioPw *c = AUDIO_PW(hw->s);\n PWVoiceIn *pw = (PWVoiceIn *) hw;\n PWVoice *v = &pw->v;\n struct audsettings obt_as = *as;\n- pwaudio *c = v->g = drv_opaque;\n- AudiodevPipewireOptions *popts = &c->dev->u.pipewire;\n+ AudiodevPipewireOptions *popts = &AUDIO_MIXENG_BACKEND(c)->dev->u.pipewire;\n AudiodevPipewirePerDirectionOptions *ppdo = popts->in;\n int r;\n \n@@ -602,7 +593,7 @@ qpw_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)\n v->frame_size *= as->nchannels;\n \n /* call the function that creates a new stream for recording */\n- r = qpw_stream_new(c, v, ppdo->stream_name ? : c->dev->id,\n+ r = qpw_stream_new(c, v, ppdo->stream_name ? : AUDIO_MIXENG_BACKEND(c)->dev->id,\n ppdo->name, SPA_DIRECTION_INPUT);\n if (r < 0) {\n pw_thread_loop_unlock(c->thread_loop);\n@@ -621,10 +612,8 @@ qpw_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)\n }\n \n static void\n-qpw_voice_fini(PWVoice *v)\n+qpw_voice_fini(AudioPw *c, PWVoice *v)\n {\n- pwaudio *c = v->g;\n-\n if (!v->stream) {\n return;\n }\n@@ -637,19 +626,18 @@ qpw_voice_fini(PWVoice *v)\n static void\n qpw_fini_out(HWVoiceOut *hw)\n {\n- qpw_voice_fini(&PW_VOICE_OUT(hw)->v);\n+ qpw_voice_fini(AUDIO_PW(hw->s), &PW_VOICE_OUT(hw)->v);\n }\n \n static void\n qpw_fini_in(HWVoiceIn *hw)\n {\n- qpw_voice_fini(&PW_VOICE_IN(hw)->v);\n+ qpw_voice_fini(AUDIO_PW(hw->s), &PW_VOICE_IN(hw)->v);\n }\n \n static void\n-qpw_voice_set_enabled(PWVoice *v, bool enable)\n+qpw_voice_set_enabled(AudioPw *c, PWVoice *v, bool enable)\n {\n- pwaudio *c = v->g;\n pw_thread_loop_lock(c->thread_loop);\n pw_stream_set_active(v->stream, enable);\n pw_thread_loop_unlock(c->thread_loop);\n@@ -658,19 +646,18 @@ qpw_voice_set_enabled(PWVoice *v, bool enable)\n static void\n qpw_enable_out(HWVoiceOut *hw, bool enable)\n {\n- qpw_voice_set_enabled(&PW_VOICE_OUT(hw)->v, enable);\n+ qpw_voice_set_enabled(AUDIO_PW(hw->s), &PW_VOICE_OUT(hw)->v, enable);\n }\n \n static void\n qpw_enable_in(HWVoiceIn *hw, bool enable)\n {\n- qpw_voice_set_enabled(&PW_VOICE_IN(hw)->v, enable);\n+ qpw_voice_set_enabled(AUDIO_PW(hw->s), &PW_VOICE_IN(hw)->v, enable);\n }\n \n static void\n-qpw_voice_set_volume(PWVoice *v, Volume *vol)\n+qpw_voice_set_volume(AudioPw *c, PWVoice *v, Volume *vol)\n {\n- pwaudio *c = v->g;\n int i, ret;\n \n pw_thread_loop_lock(c->thread_loop);\n@@ -693,16 +680,16 @@ qpw_voice_set_volume(PWVoice *v, Volume *vol)\n static void\n qpw_volume_out(HWVoiceOut *hw, Volume *vol)\n {\n- qpw_voice_set_volume(&PW_VOICE_OUT(hw)->v, vol);\n+ qpw_voice_set_volume(AUDIO_PW(hw->s), &PW_VOICE_OUT(hw)->v, vol);\n }\n \n static void\n qpw_volume_in(HWVoiceIn *hw, Volume *vol)\n {\n- qpw_voice_set_volume(&PW_VOICE_IN(hw)->v, vol);\n+ qpw_voice_set_volume(AUDIO_PW(hw->s), &PW_VOICE_IN(hw)->v, vol);\n }\n \n-static int wait_resync(pwaudio *pw)\n+static int wait_resync(AudioPw *pw)\n {\n int res;\n pw->pending_seq = pw_core_sync(pw->core, PW_ID_CORE, pw->pending_seq);\n@@ -725,7 +712,7 @@ static int wait_resync(pwaudio *pw)\n static void\n on_core_error(void *data, uint32_t id, int seq, int res, const char *message)\n {\n- pwaudio *pw = data;\n+ AudioPw *pw = data;\n \n error_report(\"error id:%u seq:%d res:%d (%s): %s\",\n id, seq, res, spa_strerror(res), message);\n@@ -737,7 +724,7 @@ on_core_error(void *data, uint32_t id, int seq, int res, const char *message)\n static void\n on_core_done(void *data, uint32_t id, int seq)\n {\n- pwaudio *pw = data;\n+ AudioPw *pw = data;\n assert(id == PW_ID_CORE);\n pw->last_seq = seq;\n if (pw->pending_seq == seq) {\n@@ -752,17 +739,20 @@ static const struct pw_core_events core_events = {\n .error = on_core_error,\n };\n \n-static void *\n-qpw_audio_init(Audiodev *dev, Error **errp)\n+static bool\n+audio_pw_realize(AudioBackend *abe, Audiodev *dev, Error **errp)\n {\n- g_autofree pwaudio *pw = g_new0(pwaudio, 1);\n+ AudioPw *pw = AUDIO_PW(abe);\n \n assert(dev->driver == AUDIODEV_DRIVER_PIPEWIRE);\n trace_pw_audio_init();\n \n+ if (!audio_pw_parent_class->realize(abe, dev, errp)) {\n+ return false;\n+ }\n+\n pw_init(NULL, NULL);\n \n- pw->dev = dev;\n pw->thread_loop = pw_thread_loop_new(\"PipeWire thread loop\", NULL);\n if (pw->thread_loop == NULL) {\n error_setg_errno(errp, errno, \"Could not create PipeWire loop\");\n@@ -801,8 +791,7 @@ qpw_audio_init(Audiodev *dev, Error **errp)\n }\n \n pw_thread_loop_unlock(pw->thread_loop);\n-\n- return g_steal_pointer(&pw);\n+ return true;\n \n fail:\n if (pw->thread_loop) {\n@@ -810,13 +799,13 @@ fail:\n }\n g_clear_pointer(&pw->context, pw_context_destroy);\n g_clear_pointer(&pw->thread_loop, pw_thread_loop_destroy);\n- return NULL;\n+ return false;\n }\n \n static void\n-qpw_audio_fini(void *opaque)\n+audio_pw_finalize(Object *obj)\n {\n- pwaudio *pw = opaque;\n+ AudioPw *pw = AUDIO_PW(obj);\n \n if (pw->thread_loop) {\n pw_thread_loop_stop(pw->thread_loop);\n@@ -831,9 +820,7 @@ qpw_audio_fini(void *opaque)\n if (pw->context) {\n pw_context_destroy(pw->context);\n }\n- pw_thread_loop_destroy(pw->thread_loop);\n-\n- g_free(pw);\n+ g_clear_pointer(&pw->thread_loop, pw_thread_loop_destroy);\n }\n \n static struct audio_pcm_ops qpw_pcm_ops = {\n@@ -855,8 +842,6 @@ static struct audio_pcm_ops qpw_pcm_ops = {\n \n static struct audio_driver pw_audio_driver = {\n .name = \"pipewire\",\n- .init = qpw_audio_init,\n- .fini = qpw_audio_fini,\n .pcm_ops = &qpw_pcm_ops,\n .max_voices_out = INT_MAX,\n .max_voices_in = INT_MAX,\n@@ -864,12 +849,24 @@ static struct audio_driver pw_audio_driver = {\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+ AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);\n+\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+}\n+\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+ .instance_finalize = audio_pw_finalize,\n },\n };\n \n", "prefixes": [ "50/85" ] }