From nobody Tue Dec 16 07:41:27 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1650874984; cv=none; d=zohomail.com; s=zohoarc; b=NYvw+9sW4QgDuxD3IZcODziydCvKx011W7nw3r0Pf85C5YaLtHo9an2ZgAc//jppXzXV6dKiGlJXq0E+/nRBJjRZ6NqoS7sIGmoaFCQ5VZqP6+tJy4s9ZFYowBSq3HIec3Quw/dMhMQL5dLdvJVwdb/NTYivGn2a2xTmuRk5Tq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650874984; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=O++t1zATSSDRwugsXR7Q5IVUhnhLz0oadJiOZXGBQI8=; b=YN9mkqYwyP+cD3w8HV8XTMwHuCtWFJOHQCJOSmqZP5irDHWeIFNIHd3GJFEtKt1dBXHonvYUXM0SXRaBdwRmOevdFIogWZjEVnGJIgdJfEL5Sd6ESNmS3lYPtk9TQpJSJJfuQ1xeXGOuHm8R+fXLuKp5W/m9fEr9aa4cHS5rEFM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1650874984033178.66499581832875; Mon, 25 Apr 2022 01:23:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-185-AVWp5vHqN6Ge6ruig8GYLQ-1; Mon, 25 Apr 2022 04:22:22 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E96B0833968; Mon, 25 Apr 2022 08:22:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D671442B93B; Mon, 25 Apr 2022 08:22:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E45F11940371; Mon, 25 Apr 2022 08:22:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3FA6E1947BBD for ; Mon, 25 Apr 2022 08:22:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 33497C28117; Mon, 25 Apr 2022 08:22:07 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2F743C28115 for ; Mon, 25 Apr 2022 08:22:07 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1582083396D for ; Mon, 25 Apr 2022 08:22:07 +0000 (UTC) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-36-ehfBWJ0VOL-Z8vV8F0KEsg-1; Mon, 25 Apr 2022 04:22:05 -0400 Received: by mail-wm1-f69.google.com with SMTP id i131-20020a1c3b89000000b00392b57fbdaaso6445307wma.0 for ; Mon, 25 Apr 2022 01:22:05 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id g5-20020adfd1e5000000b0020a97e7ba9fsm9606190wrd.92.2022.04.25.01.22.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 01:22:02 -0700 (PDT) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 17F0967B1B58; Mon, 25 Apr 2022 10:22:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650874982; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=O++t1zATSSDRwugsXR7Q5IVUhnhLz0oadJiOZXGBQI8=; b=YxHUIvXhRLkPSu+D6tD2Jn3Tiv+CfXSg3snI3xgfGyQuRqW1L20GrGSCzDl+zY4GP6L1iB Ezjht3G5+dwxaQKvA2Lukx0GfP8GM+fezBcub1t0ZFHfjKUo1aDLpN8J3N3Wx3KQWw0z9b cEse96U5O5AFTMEW4nz9/6D7Pj7EA/Q= X-MC-Unique: AVWp5vHqN6Ge6ruig8GYLQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: ehfBWJ0VOL-Z8vV8F0KEsg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O++t1zATSSDRwugsXR7Q5IVUhnhLz0oadJiOZXGBQI8=; b=Zhjn3BKb6jAbAPNXOu2sYlfSv8oIskzG9m/yLgsBP7rsJ08xWzDVttu2IFGK7No00e FlC9Hwo6CWlsdv0DL4MI9CJcPvH8+rzlIUuMfPAApiA/P5GsUlm8/+KJ8XySSMqncN4H ecGv6adwofKJumI4uSx6Rc53OHIy6NGs6bGol7cszQE8cWD4oTiPKk7KU60bEW/4+lFn ivWlwh3VD0A0bv8Mwc1JCc+wLgUuhv7QpEiJWa++ZvK8WAG3SZKCO6DVENlcYP//lCQe +mRjoBYuTFuBhNNh8WwmOQLuvGNW5UkNTlT7ISQvU4BhBc1F4ruE41626hdRAT9mKb27 YLoA== X-Gm-Message-State: AOAM531MHlW2FpPJgELelVaR/hwDcEQuDZu1ngeUqGNDF/UBYJhteQOK KodEktPLPb73OVZcU5VnlQcG+jKv+wqjLxHcPxkxFqFKrbHnAVWv3hjUMVv0LvkxNGWaW+s6Lo7 eOLcCXBXxVeUbM8jcb5c= X-Received: by 2002:a05:600c:34c4:b0:38e:b628:da95 with SMTP id d4-20020a05600c34c400b0038eb628da95mr15717844wmq.150.1650874924304; Mon, 25 Apr 2022 01:22:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6ppccZBgA9uskRcnwRbeAZSUgXdhxq0J4Qj9y/UaMbfOl3mTT83uTPV77spRbZYTUOCkj3g== X-Received: by 2002:a05:600c:34c4:b0:38e:b628:da95 with SMTP id d4-20020a05600c34c400b0038eb628da95mr15717824wmq.150.1650874924044; Mon, 25 Apr 2022 01:22:04 -0700 (PDT) From: Martin Kletzander To: qemu-devel@nongnu.org Subject: [PATCH 03/18] hw/audio: Simplify hda audio init Date: Mon, 25 Apr 2022 10:21:46 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Stefan Hajnoczi , libvir-list@redhat.com, Christian Schoenebeck , Yanan Wang , Gerd Hoffmann , "Edgar E. Iglesias" , Qiuhao Li , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Marcel Apfelbaum , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Thomas Huth , Alistair Francis , Alexander Bulekov , Bandan Das , qemu-arm@nongnu.org, Jan Kiszka , Pavel Dovgalyuk , Eduardo Habkost , Darren Kenny , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1650874984762100001 Content-Type: text/plain; charset="utf-8"; x-default="true" No return values are used anywhere, so switch the functions to be void and add support for error reporting using errp for use in next patches. Signed-off-by: Martin Kletzander Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/audio/hda-codec.c | 32 ++++++++++++++++++-------------- hw/audio/intel-hda.c | 4 +--- hw/audio/intel-hda.h | 2 +- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index feb8f9e2bb7a..e86a2adf31a0 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -676,7 +676,9 @@ static void hda_audio_stream(HDACodecDevice *hda, uint3= 2_t stnr, bool running, b } } =20 -static int hda_audio_init(HDACodecDevice *hda, const struct desc_codec *de= sc) +static void hda_audio_init(HDACodecDevice *hda, + const struct desc_codec *desc, + Error **errp) { HDAAudioState *a =3D HDA_AUDIO(hda); HDAAudioStream *st; @@ -719,7 +721,6 @@ static int hda_audio_init(HDACodecDevice *hda, const st= ruct desc_codec *desc) break; } } - return 0; } =20 static void hda_audio_exit(HDACodecDevice *hda) @@ -849,37 +850,40 @@ static Property hda_audio_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 -static int hda_audio_init_output(HDACodecDevice *hda) +static void hda_audio_init_output(HDACodecDevice *hda, Error **errp) { HDAAudioState *a =3D HDA_AUDIO(hda); + const struct desc_codec *desc =3D &output_nomixemu; =20 if (!a->mixer) { - return hda_audio_init(hda, &output_nomixemu); - } else { - return hda_audio_init(hda, &output_mixemu); + desc =3D &output_mixemu; } + + hda_audio_init(hda, desc, errp); } =20 -static int hda_audio_init_duplex(HDACodecDevice *hda) +static void hda_audio_init_duplex(HDACodecDevice *hda, Error **errp) { HDAAudioState *a =3D HDA_AUDIO(hda); + const struct desc_codec *desc =3D &duplex_nomixemu; =20 if (!a->mixer) { - return hda_audio_init(hda, &duplex_nomixemu); - } else { - return hda_audio_init(hda, &duplex_mixemu); + desc =3D &duplex_mixemu; } + + hda_audio_init(hda, desc, errp); } =20 -static int hda_audio_init_micro(HDACodecDevice *hda) +static void hda_audio_init_micro(HDACodecDevice *hda, Error **errp) { HDAAudioState *a =3D HDA_AUDIO(hda); + const struct desc_codec *desc =3D µ_nomixemu; =20 if (!a->mixer) { - return hda_audio_init(hda, µ_nomixemu); - } else { - return hda_audio_init(hda, µ_mixemu); + desc =3D µ_mixemu; } + + hda_audio_init(hda, desc, errp); } =20 static void hda_audio_base_class_init(ObjectClass *klass, void *data) diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index e77552363a4c..a17002812240 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -70,9 +70,7 @@ static void hda_codec_dev_realize(DeviceState *qdev, Erro= r **errp) return; } bus->next_cad =3D dev->cad + 1; - if (cdc->init(dev) !=3D 0) { - error_setg(errp, "HDA audio init failed"); - } + cdc->init(dev, errp); } =20 static void hda_codec_dev_unrealize(DeviceState *qdev) diff --git a/hw/audio/intel-hda.h b/hw/audio/intel-hda.h index f78c1833e341..8d710eee5d66 100644 --- a/hw/audio/intel-hda.h +++ b/hw/audio/intel-hda.h @@ -31,7 +31,7 @@ struct HDACodecBus { struct HDACodecDeviceClass { DeviceClass parent_class; =20 - int (*init)(HDACodecDevice *dev); + void (*init)(HDACodecDevice *dev, Error **errp); void (*exit)(HDACodecDevice *dev); void (*command)(HDACodecDevice *dev, uint32_t nid, uint32_t data); void (*stream)(HDACodecDevice *dev, uint32_t stnr, bool running, bool = output); --=20 2.35.1