From nobody Fri Nov 14 21:03:09 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1761893281; cv=none; d=zohomail.com; s=zohoarc; b=RjADu4hRkurqrVQHHSycW48SRdHJ3lkhh0r/oGieaBjtG9vMqlHRT0kylNhhnQe1QI+VoQrUGj/VjiuxuQ7w99S2J+AjmkiAit1KbUwZarnzqodKkEONAzK1GbTs/QveUhcst5+a5iOfBNphDCe2jIO/sHS+7KU2tppkuEOjKl0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761893281; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RfQ2XWUHbQnYLJSZTe/RpBjY+hjS5Hfs+5ZlPmfwr38=; b=WFd3/Y9N+yoCtvOUctlVHiem84cUYv665UMa4EznL4B77TNzv7NYXB1UOjEvSpicudlCi3s0KZ2rNvqKkK71AlKsLq1FL8lkEg1YUXvv7DqJrM1wkw36c2aQrI726FFkJVCnHB1hfaNvZVAMa+tIkD8QGt19AYSVQPXtOHBrcXs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176189328171149.20021219430021; Thu, 30 Oct 2025 23:48:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEivC-0005D8-SD; Fri, 31 Oct 2025 02:47:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEivA-0005CE-FS for qemu-devel@nongnu.org; Fri, 31 Oct 2025 02:47:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEiv1-0003nB-31 for qemu-devel@nongnu.org; Fri, 31 Oct 2025 02:47:36 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-457-ajYi15tQM8WDxW8tXbm9Qw-1; Fri, 31 Oct 2025 02:47:22 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7947A1953977; Fri, 31 Oct 2025 06:47:21 +0000 (UTC) Received: from localhost (unknown [10.45.242.5]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F08BF30001A6; Fri, 31 Oct 2025 06:47:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761893244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RfQ2XWUHbQnYLJSZTe/RpBjY+hjS5Hfs+5ZlPmfwr38=; b=QCwuyyhlC4vHvN7NxqlOwB7fvTfBGDAdPgv4/MR+Q8UzeMJIXEev8j8L+RKlIn3HuKWORE B+3PNJW/ZlAIaFX+wkHCuhyqCHEsGdRQ1xEwaozkJoaPVcUbP2YtlK7RSMk/7+XfctDTTJ cFc6lGuGSfjPT3ENfWE3x+H1JGnB3EY= X-MC-Unique: ajYi15tQM8WDxW8tXbm9Qw-1 X-Mimecast-MFC-AGG-ID: ajYi15tQM8WDxW8tXbm9Qw_1761893241 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann Subject: [PULL 07/36] hw/audio: generalize audio_model.init() Date: Fri, 31 Oct 2025 10:46:00 +0400 Message-ID: <20251031064631.134651-8-marcandre.lureau@redhat.com> In-Reply-To: <20251031064631.134651-1-marcandre.lureau@redhat.com> References: <20251031064631.134651-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, T_SPF_TEMPERROR=0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1761893283095154100 From: Marc-Andr=C3=A9 Lureau It is no longer PCI bus only. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/audio/model.h | 2 +- hw/audio/intel-hda.c | 4 +--- hw/audio/model.c | 12 ++++-------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/include/hw/audio/model.h b/include/hw/audio/model.h index aa237e9eb6..4d0be93042 100644 --- a/include/hw/audio/model.h +++ b/include/hw/audio/model.h @@ -3,7 +3,7 @@ #define HW_AUDIO_MODEL_H =20 void audio_register_model_with_cb(const char *name, const char *descr, - int (*init_pci)(PCIBus *bus, const char = *audiodev)); + void (*init_audio_model)(const char *aud= iodev)); void audio_register_model(const char *name, const char *descr, int isa, const char *typename); =20 diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index c46b195b62..758e130c93 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -1303,7 +1303,7 @@ static const TypeInfo hda_codec_device_type_info =3D { * create intel hda controller with codec attached to it, * so '-soundhw hda' works. */ -static int intel_hda_and_codec_init(PCIBus *bus, const char *audiodev) +static void intel_hda_and_codec_init(const char *audiodev) { g_autoptr(QDict) props =3D qdict_new(); DeviceState *intel_hda, *codec; @@ -1317,8 +1317,6 @@ static int intel_hda_and_codec_init(PCIBus *bus, cons= t char *audiodev) qdev_prop_set_string(codec, "audiodev", audiodev); qdev_realize_and_unref(codec, hdabus, &error_fatal); object_unref(intel_hda); - - return 0; } =20 static void intel_hda_register_types(void) diff --git a/hw/audio/model.c b/hw/audio/model.c index ddfefea706..7af0d960f5 100644 --- a/hw/audio/model.c +++ b/hw/audio/model.c @@ -24,14 +24,11 @@ #include "qemu/osdep.h" #include "hw/qdev-core.h" #include "monitor/qdev.h" -#include "qemu/option.h" -#include "qemu/help_option.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "qom/object.h" #include "hw/qdev-properties.h" #include "hw/isa/isa.h" -#include "hw/pci/pci.h" #include "hw/audio/model.h" =20 struct audio_model { @@ -39,20 +36,20 @@ struct audio_model { const char *descr; const char *typename; int isa; - int (*init_pci) (PCIBus *bus, const char *audiodev); + void (*init)(const char *audiodev); }; =20 static struct audio_model audio_models[9]; static int audio_models_count; =20 void audio_register_model_with_cb(const char *name, const char *descr, - int (*init_pci)(PCIBus *bus, const char = *audiodev)) + void (*init_audio_model)(const char *aud= iodev)) { assert(audio_models_count < ARRAY_SIZE(audio_models) - 1); audio_models[audio_models_count].name =3D name; audio_models[audio_models_count].descr =3D descr; audio_models[audio_models_count].isa =3D 0; - audio_models[audio_models_count].init_pci =3D init_pci; + audio_models[audio_models_count].init =3D init_audio_model; audio_models_count++; } =20 @@ -124,7 +121,6 @@ void audio_model_init(void) qdev_realize_and_unref(dev, bus, &error_fatal); } else { assert(!c->isa); - PCIBus *pci_bus =3D (PCIBus *) object_resolve_path_type("", TYPE_P= CI_BUS, NULL); - c->init_pci(pci_bus, audiodev_id); + c->init(audiodev_id); } } --=20 2.51.1