From nobody Fri Nov 14 19:25:41 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1589553368; cv=none; d=zohomail.com; s=zohoarc; b=DOs1IcThQ4dAXtqjFb+mEhCOyN/TLt5gEPCQabLHccdKARybgsSSbE3C75+v1snUBpBmiTXG/Tji6S3HHCCzXSvLpARvH0C+j1nJqMH2soJLcG/YY/sDz9lGrvqDHIipKeIRVgOzvuPHz5gS3M8FkgGvVdZj2jtxwxrsaV0d/GM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589553368; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ZuarwHpOQc0u30LFTFQMPNO3U8EShjSiKSnesAXqYBM=; b=hQJAN5Or2awvTYW57bR3WVFg2NvFr1IbeotyjtwPpWkPxk6tKIBiKARmoFD9w8ilZZE1UV9frXlh9XI8UUekkQV5NpVUjUtAiiDUI9yrukcEPICg8NY1APnqBNBu8LKY9nafUDgtgVQb8BpyaW1JA6P8GsZQN8cFN6jZHQzr1gs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1589553368434844.7783381306291; Fri, 15 May 2020 07:36:08 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-307-_KxWOi2UOkCl-4eSiWhDrQ-1; Fri, 15 May 2020 10:36:04 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A57C1872FEA; Fri, 15 May 2020 14:35:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1A6885C254; Fri, 15 May 2020 14:35:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A693E180043D; Fri, 15 May 2020 14:35:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04FEZekO004871 for ; Fri, 15 May 2020 10:35:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id BA88C5C662; Fri, 15 May 2020 14:35:40 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-115-145.ams2.redhat.com [10.36.115.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A2A55C661; Fri, 15 May 2020 14:35:40 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 30F449D57; Fri, 15 May 2020 16:35:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589553366; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:content-type:content-type: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZuarwHpOQc0u30LFTFQMPNO3U8EShjSiKSnesAXqYBM=; b=g6NlPQPU8n8EWH3aVDob/l4IuSN5I866NoG4cn/jujjlkc7q5sT7lnzXtNnDXKNf+zJpHh udTSpQCkQhiyDl24+nXNRh65JcQcFt6mb4s18KcBjoOlunWbTR5lE4o0VvV/Gg1NPmR+UW WmAuttu2RC/vrGdgt3dhjrxQ5CiAihY= X-MC-Unique: _KxWOi2UOkCl-4eSiWhDrQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v2 11/13] audio: deprecate -soundhw pcspk Date: Fri, 15 May 2020 16:35:26 +0200 Message-Id: <20200515143528.13591-12-kraxel@redhat.com> In-Reply-To: <20200515143528.13591-1-kraxel@redhat.com> References: <20200515143528.13591-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: libvir-list@redhat.com, Paolo Bonzini , Eduardo Habkost , Gerd Hoffmann X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add deprecation message to the audio init function. Factor out audio initialization and call that from both audio init and realize, so setting audiodev via -global is enough to properly initialize pcspk. Signed-off-by: Gerd Hoffmann --- hw/audio/pcspk.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index c37a3878612e..ab290e686783 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -28,6 +28,7 @@ #include "audio/audio.h" #include "qemu/module.h" #include "qemu/timer.h" +#include "qemu/error-report.h" #include "hw/timer/i8254.h" #include "migration/vmstate.h" #include "hw/audio/pcspk.h" @@ -112,11 +113,15 @@ static void pcspk_callback(void *opaque, int free) } } =20 -static int pcspk_audio_init(ISABus *bus) +static int pcspk_audio_init(PCSpkState *s) { - PCSpkState *s =3D pcspk_state; struct audsettings as =3D {PCSPK_SAMPLE_RATE, 1, AUDIO_FORMAT_U8, 0}; =20 + if (s->voice) { + /* already initialized */ + return 0; + } + AUD_register_card(s_spk, &s->card); =20 s->voice =3D AUD_open_out(&s->card, s->voice, s_spk, s, pcspk_callback= , &as); @@ -185,6 +190,10 @@ static void pcspk_realizefn(DeviceState *dev, Error **= errp) =20 isa_register_ioport(isadev, &s->ioport, s->iobase); =20 + if (s->card.state) { + pcspk_audio_init(s); + } + pcspk_state =3D s; } =20 @@ -236,9 +245,18 @@ static const TypeInfo pcspk_info =3D { .class_init =3D pcspk_class_initfn, }; =20 +static int pcspk_audio_init_soundhw(ISABus *bus) +{ + PCSpkState *s =3D pcspk_state; + + warn_report("'-soundhw pcspk' is deprecated, " + "please set a backend using '-global isa-pcspk.audiodev=3D= ' instead"); + return pcspk_audio_init(s); +} + static void pcspk_register(void) { type_register_static(&pcspk_info); - isa_register_soundhw("pcspk", "PC speaker", pcspk_audio_init); + isa_register_soundhw("pcspk", "PC speaker", pcspk_audio_init_soundhw); } type_init(pcspk_register) --=20 2.18.4