From nobody Sat May 18 18:02:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588158593; cv=none; d=zohomail.com; s=zohoarc; b=ZmG1l/SaeLsRTyGhtjXsorsJv3XsuiazL2WnY9G6qW4JurYANcrG6wS3RVsDeok73cEuPmDUytsOBo8j2FxEwKs6aQwlYS5Dhmblw5TXC391FWkU709RXp8gsfvRC2xtSvTwVajOLBl5yaGLyrtugk/mvDqjkpX8ayYpY4H4gn8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588158593; h=Content-Type:Content-Transfer-Encoding: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=CGI6929XT3WDPTBfh8WRGmzTNqGkYLrFczKvF3RsMAk=; b=SwArZJ4a0xtEOMQpfRMpx4wWmVNgMZBUt5hkKfbwPgUfwtitdNm/lUW9GNrrWEq/iA9NcXManyDsi6f+R5AXMFsaobsAXmRQKuHy3yDN18VdC9+FEeAWrAd6WmPDxYmtYjEArYf1KKjNcyBrlK8j6Vi18rniCZJ1dFQMI7QQ8pU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158815859397080.79686062156418; Wed, 29 Apr 2020 04:09:53 -0700 (PDT) Received: from localhost ([::1]:53140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkbA-0005ty-OP for importer@patchew.org; Wed, 29 Apr 2020 07:09:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44814) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkUu-0005BC-1f for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTkTw-0003qF-4w for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:23 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:38665 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTkTv-0003n2-JO for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:02:23 -0400 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-494-c9qzpF6nNfONNYFYjiQsrA-1; Wed, 29 Apr 2020 07:02:19 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C7C31801504 for ; Wed, 29 Apr 2020 11:02:18 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E4EF282E2; Wed, 29 Apr 2020 11:02:16 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0C3009D99; Wed, 29 Apr 2020 13:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588158142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CGI6929XT3WDPTBfh8WRGmzTNqGkYLrFczKvF3RsMAk=; b=eWa/3s/SUb+J6nrwCLE+8xZixl13teP2jMM3TLvsqv9/HZEpmWsyJOP6K9hYssQCiA1EwV f2X+6IEtPQmMQDIYipt5938SW6FaU/1xURwL9bJQxGouUEmo5jfU96ZQudg1zT0HZ/yq+Y VTYTjKKF/yVzlehH4xh+4fNDKhe49Xk= X-MC-Unique: c9qzpF6nNfONNYFYjiQsrA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 01/12] stubs: add isa_create_simple Date: Wed, 29 Apr 2020 13:02:03 +0200 Message-Id: <20200429110214.29037-2-kraxel@redhat.com> In-Reply-To: <20200429110214.29037-1-kraxel@redhat.com> References: <20200429110214.29037-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 00:53:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Needed for -soundhw cleanup. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- stubs/isa-bus.c | 7 +++++++ stubs/Makefile.objs | 1 + 2 files changed, 8 insertions(+) create mode 100644 stubs/isa-bus.c diff --git a/stubs/isa-bus.c b/stubs/isa-bus.c new file mode 100644 index 000000000000..cbebaed4ad04 --- /dev/null +++ b/stubs/isa-bus.c @@ -0,0 +1,7 @@ +#include "qemu/osdep.h" +#include "hw/isa/isa.h" + +ISADevice *isa_create_simple(ISABus *bus, const char *name) +{ + return NULL; +} diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 45be5dc0ed78..c61ff38cc801 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -13,6 +13,7 @@ stub-obj-y +=3D get-vm-name.o stub-obj-y +=3D iothread.o stub-obj-y +=3D iothread-lock.o stub-obj-y +=3D is-daemonized.o +stub-obj-y +=3D isa-bus.o stub-obj-$(CONFIG_LINUX_AIO) +=3D linux-aio.o stub-obj-$(CONFIG_LINUX_IO_URING) +=3D io_uring.o stub-obj-y +=3D machine-init-done.o --=20 2.18.2 From nobody Sat May 18 18:02:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588158395; cv=none; d=zohomail.com; s=zohoarc; b=Nga5d8e3vwd/vvKuI1bh16clsGR+KjKdjfmb41rB01qgu15+vdim7FqHXvNqEoEpaxWJducGVnPY6M5NekCxXol7l4JscltId8I9kA6NUtZo4ASf6qWhZjepSk1ILRH43mKyqhdWAdi8xHQ3+vW69ybq/nsvI+Wb8cpjTm38A5M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588158395; h=Content-Type:Content-Transfer-Encoding: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=VAdLDhz6Qh7ovRYkXWjD79W/T/Cg9GrR3PS+WxGbdoI=; b=PFzz5zSbhETI3G10triYVIrRBSW+BQlYQZ1H2I52T3pzix1bBDvW7NOPeq5PAqToiFlxqOoSdlJGV9dulRV93wN1cDmIYWt/KVnhdsh0yH5bNkpXdeZDPx4sWH8NzIk5TZENtSpnwLY0ARap/NSkejCWZj7g7ieQSRYsY7OBZN4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588158395535932.5358248728386; Wed, 29 Apr 2020 04:06:35 -0700 (PDT) Received: from localhost ([::1]:42722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkXy-00019v-Ah for importer@patchew.org; Wed, 29 Apr 2020 07:06:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44794) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkUs-0005Ae-1u for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTkTv-0003ma-0p for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:21 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:29027 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTkTu-0003lo-KC for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:02:22 -0400 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-263-jG_COuaRPuOiLYmqc5px7Q-1; Wed, 29 Apr 2020 07:02:19 -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 EB802108C30D for ; Wed, 29 Apr 2020 11:02:18 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 046AF5C1C8; Wed, 29 Apr 2020 11:02:16 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 164689D9B; Wed, 29 Apr 2020 13:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588158141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VAdLDhz6Qh7ovRYkXWjD79W/T/Cg9GrR3PS+WxGbdoI=; b=ZNsPueYret6nECkNEw/RpFCtx9mHlI1s2hR4bojqr68jLZGre8o+84qLN73X6NiVqqYsQy ZprvpjKUv+PnmHv0IcBQ55nCAMmvVjfExpRIDqTvmnS3m82dbBlH+TnujLOU4ldPa8b+1G wctf+x8tvW5govJb4mB9TyMIYwli92w= X-MC-Unique: jG_COuaRPuOiLYmqc5px7Q-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 02/12] stubs: add pci_create_simple Date: Wed, 29 Apr 2020 13:02:04 +0200 Message-Id: <20200429110214.29037-3-kraxel@redhat.com> In-Reply-To: <20200429110214.29037-1-kraxel@redhat.com> References: <20200429110214.29037-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=207.211.31.81; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 01:28:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Needed for -soundhw cleanup. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- stubs/pci-bus.c | 7 +++++++ stubs/Makefile.objs | 1 + 2 files changed, 8 insertions(+) create mode 100644 stubs/pci-bus.c diff --git a/stubs/pci-bus.c b/stubs/pci-bus.c new file mode 100644 index 000000000000..e833947f1f41 --- /dev/null +++ b/stubs/pci-bus.c @@ -0,0 +1,7 @@ +#include "qemu/osdep.h" +#include "hw/pci/pci.h" + +PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name) +{ + return NULL; +} diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index c61ff38cc801..5e7f2b3f061e 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -40,6 +40,7 @@ stub-obj-y +=3D target-get-monitor-def.o stub-obj-y +=3D vmgenid.o stub-obj-y +=3D xen-common.o stub-obj-y +=3D xen-hvm.o +stub-obj-y +=3D pci-bus.o stub-obj-y +=3D pci-host-piix.o stub-obj-y +=3D ram-block.o stub-obj-y +=3D ramfb.o --=20 2.18.2 From nobody Sat May 18 18:02:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588158480; cv=none; d=zohomail.com; s=zohoarc; b=KYFZVhoJWhmGigBarwVpDdr8GF9fnxr7CBk7LJZFxGaSqY7/VS2SZBAOZJhwpWr6Z3OU3YQmtNNF0dbGBmvw1HqPpiZJaczzyZkDDfowr3WJwoAe4twSq5Fp4hlmBEbwA0J1etWWV0sYtVEB9/uZuvF/QuAO0M9IrmdTnZCfkm8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588158480; h=Content-Type:Content-Transfer-Encoding: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=F1VEyEy6/SYTd+tGBUceu/egLeZngUGGZbtKyuAeHtE=; b=dOTyz5OH2wBhxjb0Ftt8h6BQ5torsLIwmbtCjEzK0UqPjA3AuQGkjd9WK50p3DfTCswqDe3hpcjrBGRIRJC1BodL/szW8WerULJtRrB42I4NC9kPxC2g+y96snUDPSy8RwOJb8k8dvzmvfAnzdFyDDsq3UDjdPCxvHEOd0nJTg0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588158480789732.1298619975704; Wed, 29 Apr 2020 04:08:00 -0700 (PDT) Received: from localhost ([::1]:47542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkZL-00037q-KL for importer@patchew.org; Wed, 29 Apr 2020 07:07:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44836) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkUw-0005Bk-VN for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTkTz-0003ys-DY for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:44903 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTkTx-0003sl-CS for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:02:25 -0400 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-368-Upyp2VRHOz-7PtxZqr6rWA-1; Wed, 29 Apr 2020 07:02:19 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1E63BEC1A2 for ; Wed, 29 Apr 2020 11:02:19 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 080255D9F1; Wed, 29 Apr 2020 11:02:16 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 20ACD9D9C; Wed, 29 Apr 2020 13:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588158144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F1VEyEy6/SYTd+tGBUceu/egLeZngUGGZbtKyuAeHtE=; b=WJ9bTePbx53Miii0twfP+ccP48dWKC4q+vynWoXiIkxWu53FOOguGizQVH7MZEsdj4E4xD 9HyXUWGGP+H+LBHgynMYkuJa64WJHkHgSWaWsTro/AuPUgCe4BbTy+9wQjXMyUWr5N7Kao K2l916ljPoj2VIqnr+WPnFM3fQI1l5g= X-MC-Unique: Upyp2VRHOz-7PtxZqr6rWA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 03/12] audio: add deprecated_register_soundhw Date: Wed, 29 Apr 2020 13:02:05 +0200 Message-Id: <20200429110214.29037-4-kraxel@redhat.com> In-Reply-To: <20200429110214.29037-1-kraxel@redhat.com> References: <20200429110214.29037-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 01:42:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add helper function for -soundhw deprecation. It can replace the simple init functions which just call {isa,pci}_create_simple() with a hardcoded type. It also prints a deprecation message. Signed-off-by: Gerd Hoffmann --- include/hw/audio/soundhw.h | 2 ++ hw/audio/soundhw.c | 24 +++++++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/include/hw/audio/soundhw.h b/include/hw/audio/soundhw.h index c8eef8241846..f09a297854af 100644 --- a/include/hw/audio/soundhw.h +++ b/include/hw/audio/soundhw.h @@ -6,6 +6,8 @@ void isa_register_soundhw(const char *name, const char *des= cr, =20 void pci_register_soundhw(const char *name, const char *descr, int (*init_pci)(PCIBus *bus)); +void deprecated_register_soundhw(const char *name, const char *descr, + int isa, const char *typename); =20 void soundhw_init(void); void select_soundhw(const char *optarg); diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c index c750473c8f0c..173b674ff53a 100644 --- a/hw/audio/soundhw.c +++ b/hw/audio/soundhw.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/option.h" #include "qemu/help_option.h" #include "qemu/error-report.h" #include "qom/object.h" @@ -32,6 +33,7 @@ struct soundhw { const char *name; const char *descr; + const char *typename; int enabled; int isa; union { @@ -65,6 +67,17 @@ void pci_register_soundhw(const char *name, const char *= descr, soundhw_count++; } =20 +void deprecated_register_soundhw(const char *name, const char *descr, + int isa, const char *typename) +{ + assert(soundhw_count < ARRAY_SIZE(soundhw) - 1); + soundhw[soundhw_count].name =3D name; + soundhw[soundhw_count].descr =3D descr; + soundhw[soundhw_count].isa =3D isa; + soundhw[soundhw_count].typename =3D typename; + soundhw_count++; +} + void select_soundhw(const char *optarg) { struct soundhw *c; @@ -136,7 +149,16 @@ void soundhw_init(void) =20 for (c =3D soundhw; c->name; ++c) { if (c->enabled) { - if (c->isa) { + if (c->typename) { + warn_report("'-soundhw %s' is deprecated, " + "please use '-device %s' instead", + c->name, c->typename); + if (c->isa) { + isa_create_simple(isa_bus, c->typename); + } else { + pci_create_simple(pci_bus, -1, c->typename); + } + } else if (c->isa) { if (!isa_bus) { error_report("ISA bus not available for %s", c->name); exit(1); --=20 2.18.2 From nobody Sat May 18 18:02:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588158303; cv=none; d=zohomail.com; s=zohoarc; b=Jvdi8k95AJYsrYojGrs9H2X8vq8NaqbBKCVbknemuXETX8JSW2i0kwjO57J6gZiUt0WITNZCLxn7ZjhsPBNQtzYaGWeu/aoWw+IlgBs7XADjM9vzs5MaKEW9NsTV4RHlrzB7u/y50EWhMaIWT/oxqXz2j50rP/DuocUdVJKaRzs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588158303; h=Content-Type:Content-Transfer-Encoding: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=jEJMnpIN0xvpBQer9GgaaNRqIx+5ROqZeKmYgXn7ais=; b=C4C5rY4i0ef02dJs6jUuFOtp17JRfHWcsWu80kK7dodkJGpRjA2KUYWgUHxaXWg/2PBn9BHWBWcl0WC8zMi0ndb/C4CZNtWPrKqbxrZdq1AkERCfX606k6cc2WzAkQjOIC82ZBqRfF28tkTQVw2qKL0iIlclYckTXd+3o/LrU4E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588158303386463.62048436812427; Wed, 29 Apr 2020 04:05:03 -0700 (PDT) Received: from localhost ([::1]:36702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkWU-0006lq-65 for importer@patchew.org; Wed, 29 Apr 2020 07:05:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44806) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkUt-0005Av-2H for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTkTv-0003mo-4T for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:22 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:44994 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTkTu-0003lp-MC for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:02:22 -0400 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-367-u29wFlbsOEKGeyq4064imQ-1; Wed, 29 Apr 2020 07:02:19 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0F5AB462 for ; Wed, 29 Apr 2020 11:02:19 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AD571002396; Wed, 29 Apr 2020 11:02:16 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2B4739D9D; Wed, 29 Apr 2020 13:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588158141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jEJMnpIN0xvpBQer9GgaaNRqIx+5ROqZeKmYgXn7ais=; b=g8NzmU0Cf+ZlibAIyoRkloqRADBmr2s5VCxj1jCdcp8Z4D9pWkP69psm2NFF6jD6grmOll /BYMKCtMlpXWZtHvJ8Bh1mp9rZC2VX2D74dP+eK53R36KdmPZhNN9PolvEawbvw9mSmh7U LJe0NDez7oRW1bLD5Hdx/NLSr+HmhuE= X-MC-Unique: u29wFlbsOEKGeyq4064imQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 04/12] audio: deprecate -soundhw ac97 Date: Wed, 29 Apr 2020 13:02:06 +0200 Message-Id: <20200429110214.29037-5-kraxel@redhat.com> In-Reply-To: <20200429110214.29037-1-kraxel@redhat.com> References: <20200429110214.29037-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=207.211.31.81; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 01:28:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Switch to deprecated_register_soundhw(). Remove the now obsolete init function. Add an alias so both ac97 and AC97 are working with -device. Signed-off-by: Gerd Hoffmann --- hw/audio/ac97.c | 9 ++------- qdev-monitor.c | 1 + 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 1ec87feec0cb..f32eb46f7f4d 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -1395,12 +1395,6 @@ static void ac97_exit(PCIDevice *dev) AUD_remove_card(&s->card); } =20 -static int ac97_init (PCIBus *bus) -{ - pci_create_simple(bus, -1, TYPE_AC97); - return 0; -} - static Property ac97_properties[] =3D { DEFINE_AUDIO_PROPERTIES(AC97LinkState, card), DEFINE_PROP_END_OF_LIST (), @@ -1438,7 +1432,8 @@ static const TypeInfo ac97_info =3D { static void ac97_register_types (void) { type_register_static (&ac97_info); - pci_register_soundhw("ac97", "Intel 82801AA AC97 Audio", ac97_init); + deprecated_register_soundhw("ac97", "Intel 82801AA AC97 Audio", + 0, TYPE_AC97); } =20 type_init (ac97_register_types) diff --git a/qdev-monitor.c b/qdev-monitor.c index 9833b3354969..ce45bcfa03f3 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -52,6 +52,7 @@ typedef struct QDevAlias =20 /* Please keep this table sorted by typename. */ static const QDevAlias qdev_alias_table[] =3D { + { "AC97", "ac97" }, /* -soundhw name */ { "e1000", "e1000-82540em" }, { "ich9-ahci", "ahci" }, { "lsi53c895a", "lsi" }, --=20 2.18.2 From nobody Sat May 18 18:02:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588158305; cv=none; d=zohomail.com; s=zohoarc; b=lf+ZvdcmPzGAsB3zj5QryATt406Z7bQOvZrfrHM7MYOeq5EmOJSjBXdkTMG55cHsnVY4jlHFvlU3dVQRifeiMnmT3VfQU+YFUGgyiGmAZBqfxEPj3VYgV2I8DTfmZDJPfe7HUWWQVHUocP1yPNsCnfPns1tLAItsxPFrar6WMXU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588158305; h=Content-Type:Content-Transfer-Encoding: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=fFsuZt34R2x6tgCSKqR0BQQIlxpOlkHGdpBGsp1Inns=; b=j6fsLEJj0dxOmN6fcRBFU7AYLQ7jOHNi0/N8YpW393hf5Gu0lC1alzc2XDgwvAYZ9X0X7kkkZz94cI37XnEw5Cr8Njga4h7vVq/f/mpDyGq5P0l1lGLSkcbnfKeo88gbbYOq8geFJkfX/PiTQWKLOQocGtVMUcFuqybbbkd4BbI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588158305834470.2104462468569; Wed, 29 Apr 2020 04:05:05 -0700 (PDT) Received: from localhost ([::1]:36892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkWW-0006r0-83 for importer@patchew.org; Wed, 29 Apr 2020 07:05:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44832) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkUw-0005Bh-OV for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTkTz-0003yU-AH for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:58024 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTkTx-0003sf-AF for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:02:25 -0400 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-266-6rNjF9UCMOmA3Cjk3QsIUA-1; Wed, 29 Apr 2020 07:02:20 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F27DC835B48 for ; Wed, 29 Apr 2020 11:02:19 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB7C999D6; Wed, 29 Apr 2020 11:02:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 356289D9E; Wed, 29 Apr 2020 13:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588158144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fFsuZt34R2x6tgCSKqR0BQQIlxpOlkHGdpBGsp1Inns=; b=iK3qi0K3hu5VXrxaBB2SRcNZ3y8JjpOsMBkPmp4CDiCxz7ovX1RW61thvA9OEfHbRE2vu0 6QjZooFoD72FZdsvDRaRht/b/vSWbQfo6japI497HzFwGUJv3kVHBPm36GtuacWtR4Uibx J+/RGl3B50Qi+DBKUQX7gD4SPHRVS4c= X-MC-Unique: 6rNjF9UCMOmA3Cjk3QsIUA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 05/12] audio: deprecate -soundhw es1370 Date: Wed, 29 Apr 2020 13:02:07 +0200 Message-Id: <20200429110214.29037-6-kraxel@redhat.com> In-Reply-To: <20200429110214.29037-1-kraxel@redhat.com> References: <20200429110214.29037-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 01:42:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Switch to deprecated_register_soundhw(). Remove the now obsolete init function. Add an alias so both es1370 and ES1370 are working with -device. Signed-off-by: Gerd Hoffmann --- hw/audio/es1370.c | 9 ++------- qdev-monitor.c | 1 + 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index 89c4dabcd44f..f36ed95ac93f 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -881,12 +881,6 @@ static void es1370_exit(PCIDevice *dev) AUD_remove_card(&s->card); } =20 -static int es1370_init (PCIBus *bus) -{ - pci_create_simple (bus, -1, TYPE_ES1370); - return 0; -} - static Property es1370_properties[] =3D { DEFINE_AUDIO_PROPERTIES(ES1370State, card), DEFINE_PROP_END_OF_LIST(), @@ -925,7 +919,8 @@ static const TypeInfo es1370_info =3D { static void es1370_register_types (void) { type_register_static (&es1370_info); - pci_register_soundhw("es1370", "ENSONIQ AudioPCI ES1370", es1370_init); + deprecated_register_soundhw("es1370", "ENSONIQ AudioPCI ES1370", + 0, TYPE_ES1370); } =20 type_init (es1370_register_types) diff --git a/qdev-monitor.c b/qdev-monitor.c index ce45bcfa03f3..f841821f3aa6 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -54,6 +54,7 @@ typedef struct QDevAlias static const QDevAlias qdev_alias_table[] =3D { { "AC97", "ac97" }, /* -soundhw name */ { "e1000", "e1000-82540em" }, + { "ES1370", "es1370" }, /* -soundhw name */ { "ich9-ahci", "ahci" }, { "lsi53c895a", "lsi" }, { "virtio-9p-ccw", "virtio-9p", QEMU_ARCH_S390X }, --=20 2.18.2 From nobody Sat May 18 18:02:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588158585; cv=none; d=zohomail.com; s=zohoarc; b=cW/xNCJgHHDVwfrq+Cw/Hk8Dbtg/3orCxy0bDehS8/otFvpBwupN5CA7Fjl/gAxYziE//fDCzDGIMma/odW1t7N6bHfLqPJX04lVEsl4QJ0JG/lc5afe2LTgbcQVF1rHdNikOZQzN7bwBqsakBGxPGvNduaMT1rVy/DrmKUbjYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588158585; h=Content-Type:Content-Transfer-Encoding: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=7koQvZy8UosvfF1UQbYBUZT0Za8I46Ydf0Ny1mGVqxk=; b=ATBpv0qBL2yLcopqEF88H9CQqUsKjoF3A9oByC21RTlIEGrQXUpusaT7xwitjFynfg8QxRETuI0nymvFTJLM/R4oMyNu+RolRGQX1ssXU23mM5pBHURjo52mh5SnAa1mJwKTf/FagA2hzgU1Q5tcoAQr63hB2u4eKng+2V9rN1w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588158585299185.45025332479656; Wed, 29 Apr 2020 04:09:45 -0700 (PDT) Received: from localhost ([::1]:52516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkb2-0005e9-2a for importer@patchew.org; Wed, 29 Apr 2020 07:09:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44850) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkUz-0005CG-E5 for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTkU1-000474-7j for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:29 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:37338 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTkU0-00042d-Ol for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:02:28 -0400 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-36-SfcXf38HMwmQZn5uNhcxbA-1; Wed, 29 Apr 2020 07:02:23 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CCBE1EC1A3 for ; Wed, 29 Apr 2020 11:02:22 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE384579A9; Wed, 29 Apr 2020 11:02:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3DF519D9F; Wed, 29 Apr 2020 13:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588158147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7koQvZy8UosvfF1UQbYBUZT0Za8I46Ydf0Ny1mGVqxk=; b=b3UfEOMZnL9RVCL3kwQKEZuMeK9PiIoTey168x6txtv9yPH64UlDQK/JZBGB3pCUzJgTyQ TvH2R91TXRt3k3dHiQZ1MLGt/zhudEWkJGysQhRWsyPW7T2GZJxdYeOluGFh9XjlLsn3aK WdDRuQFASzEFQlzkHQ436P+4kcyxmG8= X-MC-Unique: SfcXf38HMwmQZn5uNhcxbA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 06/12] audio: deprecate -soundhw adlib Date: Wed, 29 Apr 2020 13:02:08 +0200 Message-Id: <20200429110214.29037-7-kraxel@redhat.com> In-Reply-To: <20200429110214.29037-1-kraxel@redhat.com> References: <20200429110214.29037-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 00:53:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Switch to deprecated_register_soundhw(). Remove the now obsolete init function. Signed-off-by: Gerd Hoffmann --- hw/audio/adlib.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index d6c1fb0586c6..f62fbd413169 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -322,16 +322,10 @@ static const TypeInfo adlib_info =3D { .class_init =3D adlib_class_initfn, }; =20 -static int Adlib_init (ISABus *bus) -{ - isa_create_simple (bus, TYPE_ADLIB); - return 0; -} - static void adlib_register_types (void) { type_register_static (&adlib_info); - isa_register_soundhw("adlib", ADLIB_DESC, Adlib_init); + deprecated_register_soundhw("adlib", ADLIB_DESC, 1, TYPE_ADLIB); } =20 type_init (adlib_register_types) --=20 2.18.2 From nobody Sat May 18 18:02:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588158396; cv=none; d=zohomail.com; s=zohoarc; b=Vl15uWasn78iEOxpOdU86ZYWHA0/TdhN1gJ2IviLUhd41Q9hP47zJI6znfyusshBRC8HKxFN5h2XgDPhYkQnvALdAVjOdXiSOsPwy8ICwSMbWt7+/l3mooTwXbiqM50TPUfsCeGbMD9ax56GlBU3dOIxAsLvMSpJGDafAac8RdY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588158396; h=Content-Type:Content-Transfer-Encoding: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=FUjFOzZzORezLBcwgelbQizWEJVXm4QShaFMGEFRtCc=; b=GDdQv3s3LxSIJujWA0swsJr0PWdMUlilSPrBIHGQcLZrYmiwe9sVSuEtwk3mXUitgWXtNZvdyDGgTq4aMsZZGZfs4o9JCukyNnMxIZw4kzhauv3N3Gvm/4Lg0X/kPPfQkAp64i4iJZCwV5ULyg8rFG+3iLnM5QMn04UxSTQOOBo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588158396210358.26790605288204; Wed, 29 Apr 2020 04:06:36 -0700 (PDT) Received: from localhost ([::1]:42762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkXz-0001Ar-1J for importer@patchew.org; Wed, 29 Apr 2020 07:06:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44810) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkUt-0005B4-IB for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTkTv-0003pT-UE for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:23 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:45959 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTkTv-0003m0-GD for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:02:23 -0400 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-342-8O8VawFoPBmhFkisEduFvA-1; Wed, 29 Apr 2020 07:02:20 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 131C9108C30F for ; Wed, 29 Apr 2020 11:02:20 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id B516E5D9E5; Wed, 29 Apr 2020 11:02:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 465989DA0; Wed, 29 Apr 2020 13:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588158142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FUjFOzZzORezLBcwgelbQizWEJVXm4QShaFMGEFRtCc=; b=hIg4F3AUN8ZZ+o6z3rYvxLBMjS384+iRpT1tAsyQd6b2dClgyj5Yd9BN5luv83pMRdueCP LpD6EGKbIcB24JmbbaVLUcy85SL8HX8GIslgwcPV6CSs8zb7klROm8wb8/ebcFuYcB2HLL Bz+gdT9ib73riUVGb6ofn07etxvxNRY= X-MC-Unique: 8O8VawFoPBmhFkisEduFvA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 07/12] audio: deprecate -soundhw cs4231a Date: Wed, 29 Apr 2020 13:02:09 +0200 Message-Id: <20200429110214.29037-8-kraxel@redhat.com> In-Reply-To: <20200429110214.29037-1-kraxel@redhat.com> References: <20200429110214.29037-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 00:53:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Switch to deprecated_register_soundhw(). Remove the now obsolete init function. Signed-off-by: Gerd Hoffmann --- hw/audio/cs4231a.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index ffdbb58d6a11..59705a8d4701 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.c @@ -683,12 +683,6 @@ static void cs4231a_realizefn (DeviceState *dev, Error= **errp) AUD_register_card ("cs4231a", &s->card); } =20 -static int cs4231a_init (ISABus *bus) -{ - isa_create_simple (bus, TYPE_CS4231A); - return 0; -} - static Property cs4231a_properties[] =3D { DEFINE_AUDIO_PROPERTIES(CSState, card), DEFINE_PROP_UINT32 ("iobase", CSState, port, 0x534), @@ -720,7 +714,7 @@ static const TypeInfo cs4231a_info =3D { static void cs4231a_register_types (void) { type_register_static (&cs4231a_info); - isa_register_soundhw("cs4231a", "CS4231A", cs4231a_init); + deprecated_register_soundhw("cs4231a", "CS4231A", 1, TYPE_CS4231A); } =20 type_init (cs4231a_register_types) --=20 2.18.2 From nobody Sat May 18 18:02:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588158682; cv=none; d=zohomail.com; s=zohoarc; b=cBSM61+s7TUmG+BdNoGz+6K6P30dSeewcDOEFzPyVz+AeUbnwXNe5H5/hNODqYgETdN6e/UAUhdGkzulK5gbD1Jlq7/9QRfEzRRNcuaFo/F0wPHbi32EMSbGm5XXT7ua+CljIVfzENUY+IgGIanYM0ybNWdakp1LdyCNjA0xQG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588158682; h=Content-Type:Content-Transfer-Encoding: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=eWhEbL+FaYUiHQWlH6+AXjDfQ3NVOtqgxWbSXhQ9H2Q=; b=U74c3pb7HUaTP1tKC9DnCG6AIO7v7SqRwONxMtbNzBIZ3ydxo/WhrukB7xMZyHkiJ6J1On4yKw4eRfYsJ5ye/nyMYwf0tepYhXigG/nGD8PZkUJ5exEdVC43Bikj+8k8JbvYVZX/aFXkwoFkJDYX6/JrerpDdjqZoQpJrJ1vxtA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588158682497167.65363995708697; Wed, 29 Apr 2020 04:11:22 -0700 (PDT) Received: from localhost ([::1]:58996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkcb-0008N7-6R for importer@patchew.org; Wed, 29 Apr 2020 07:11:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44822) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkUv-0005BS-8r for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTkTw-0003sG-KO for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:25 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:32584 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTkTw-0003nc-5X for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:02:24 -0400 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-266-XTPl2tNWMRqR99-ulFeJIA-1; Wed, 29 Apr 2020 07:02:20 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1EF858015CF for ; Wed, 29 Apr 2020 11:02:20 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id B88ED27CC4; Wed, 29 Apr 2020 11:02:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4F09E9DA1; Wed, 29 Apr 2020 13:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588158143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eWhEbL+FaYUiHQWlH6+AXjDfQ3NVOtqgxWbSXhQ9H2Q=; b=fDh1FjvZ1/DJgElvLF96BJTaykzoyYPDYq/c6bJAZV3lz0D8Zv5nQ7xT5U7eOKI4TtOAVe sIGq9p00xgmpo/Ar2cb64jTcB89z7pENnqw9xJ8hsFC+HwO6rvN0OPZHlhekMG9zTCGqJp vz77iJCFcPZzThcHA+NvLoVSZfE9QGE= X-MC-Unique: XTPl2tNWMRqR99-ulFeJIA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 08/12] audio: deprecate -soundhw gus Date: Wed, 29 Apr 2020 13:02:10 +0200 Message-Id: <20200429110214.29037-9-kraxel@redhat.com> In-Reply-To: <20200429110214.29037-1-kraxel@redhat.com> References: <20200429110214.29037-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 00:53:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Switch to deprecated_register_soundhw(). Remove the now obsolete init function. Signed-off-by: Gerd Hoffmann --- hw/audio/gus.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/audio/gus.c b/hw/audio/gus.c index eb4a803fb53b..61d16fad9ffb 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -292,12 +292,6 @@ static void gus_realizefn (DeviceState *dev, Error **e= rrp) AUD_set_active_out (s->voice, 1); } =20 -static int GUS_init (ISABus *bus) -{ - isa_create_simple (bus, TYPE_GUS); - return 0; -} - static Property gus_properties[] =3D { DEFINE_AUDIO_PROPERTIES(GUSState, card), DEFINE_PROP_UINT32 ("freq", GUSState, freq, 44100), @@ -328,7 +322,7 @@ static const TypeInfo gus_info =3D { static void gus_register_types (void) { type_register_static (&gus_info); - isa_register_soundhw("gus", "Gravis Ultrasound GF1", GUS_init); + deprecated_register_soundhw("gus", "Gravis Ultrasound GF1", 1, TYPE_GU= S); } =20 type_init (gus_register_types) --=20 2.18.2 From nobody Sat May 18 18:02:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588158749; cv=none; d=zohomail.com; s=zohoarc; b=bNHMtzHlyF3F2z6NYps43QNyZ+q4hCcCBqdih/c4TfCQKKU71k7PbaD16Ep4MEzu7qWELYLxHzEZg/Iypv5rUEVwaONFPiAJPS9Gi8ZX7cc3ptaTJOCPYv9pu057Dqqlj0VwvLadzf5avH6fmBeCBxrqD1QStU4++boXsjGoxCE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588158749; h=Content-Type:Content-Transfer-Encoding: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=PvDLqvzBI0CfTZenu/nOV53MsSThnMnnkIRJz4NuciA=; b=YfY9t8uVdV7p3iteIg0tsC1tM7FcgLISuQmXnQxwT1HI3+pbJ30JL4uyWhYc3Df8Cvohpqo0tUmkSxBsGT85PiXp2nXJ1exaNifFXowJ4JTL9n0XD1i+3Ae2wdLwliQsxDL9gX3WR/jmEm/3BWT29gwNwxTnPq1BasSISrC5CDQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588158749007138.64079511218813; Wed, 29 Apr 2020 04:12:29 -0700 (PDT) Received: from localhost ([::1]:33842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkdf-0001Ci-Qc for importer@patchew.org; Wed, 29 Apr 2020 07:12:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44826) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkUv-0005BZ-Rj for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTkTy-0003wK-En for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:25 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:57994 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTkTx-0003qQ-0Z for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:02:25 -0400 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-266-jG6iz1dxMl2wxN3VjVRSKw-1; Wed, 29 Apr 2020 07:02:21 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 33D5E107ACF9 for ; Wed, 29 Apr 2020 11:02:20 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3C39282C8; Wed, 29 Apr 2020 11:02:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 579139DA2; Wed, 29 Apr 2020 13:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588158143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PvDLqvzBI0CfTZenu/nOV53MsSThnMnnkIRJz4NuciA=; b=AsZaS9o+7X2B/iZWCES2kDIO3F2v+BlehawIZedqFBSEQqWmgFhclen/H/xEKDNesiVkNs izz+jRTA7YvzQHmjKUDlz2e/V4UwP1C3wmPlqy05b/u1QsBEmLtisokqKCKYBG2OtWgzVD cRTAsHDqPP84L93Iwq9gL1eGxbS1CAE= X-MC-Unique: jG6iz1dxMl2wxN3VjVRSKw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 09/12] audio: deprecate -soundhw sb16 Date: Wed, 29 Apr 2020 13:02:11 +0200 Message-Id: <20200429110214.29037-10-kraxel@redhat.com> In-Reply-To: <20200429110214.29037-1-kraxel@redhat.com> References: <20200429110214.29037-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 01:42:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Switch to deprecated_register_soundhw(). Remove the now obsolete init function. Signed-off-by: Gerd Hoffmann --- hw/audio/sb16.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index df6f755a37f8..2d9e50f99b5d 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -1415,12 +1415,6 @@ static void sb16_realizefn (DeviceState *dev, Error = **errp) AUD_register_card ("sb16", &s->card); } =20 -static int SB16_init (ISABus *bus) -{ - isa_create_simple (bus, TYPE_SB16); - return 0; -} - static Property sb16_properties[] =3D { DEFINE_AUDIO_PROPERTIES(SB16State, card), DEFINE_PROP_UINT32 ("version", SB16State, ver, 0x0405), /* 4.5 */ @@ -1453,7 +1447,8 @@ static const TypeInfo sb16_info =3D { static void sb16_register_types (void) { type_register_static (&sb16_info); - isa_register_soundhw("sb16", "Creative Sound Blaster 16", SB16_init); + deprecated_register_soundhw("sb16", "Creative Sound Blaster 16", + 1, TYPE_SB16); } =20 type_init (sb16_register_types) --=20 2.18.2 From nobody Sat May 18 18:02:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588158826; cv=none; d=zohomail.com; s=zohoarc; b=EadkrBy7Q8Bfggcop8/gMYq0VUBteAgi9BTKeYyrRsHHfxB/oQylJDaA3/b1Lzdemc7SL4RH0RwP+BvAlbTHZrIylZvA5HMJBL1+9cQvJ6dIsatJqV+ScWFAzaxP8ETR974OiWC97FvUhuOAWwH8aaq1YujY02G/FiKGbmapzEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588158826; h=Content-Type:Content-Transfer-Encoding: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=U8KXLBcIqzMr231ku/aiAX86UiTP/JSBvfezgXhyRiE=; b=O/OKq5u5k0ttvk/bUVE3nfLVuHEuvwUGtkwblWOEDhYZNIftGuxnJVVTjRJZ6qb/9FUraP0zb5MidF+gLCqY5Yw3WFqynBZ+OM94J0RIWanBv7GQDdaUk5JMbmDAql0ZO3VQJszKdod5p35BUOsoao0CmjkyWRu2Ip1Vh3Zl2UE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158815882690981.2837024127034; Wed, 29 Apr 2020 04:13:46 -0700 (PDT) Received: from localhost ([::1]:36028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkev-0002ZW-J6 for importer@patchew.org; Wed, 29 Apr 2020 07:13:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44840) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkUx-0005Bq-Dl for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTkU0-00042X-BI for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:27 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:42696 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTkTz-0003vx-7R for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:02:27 -0400 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-305-sUZtw12dNCusBwB2szLHXA-1; Wed, 29 Apr 2020 07:02:23 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D56E71005510 for ; Wed, 29 Apr 2020 11:02:22 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id D69E8648C8; Wed, 29 Apr 2020 11:02:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 601209DA4; Wed, 29 Apr 2020 13:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588158145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U8KXLBcIqzMr231ku/aiAX86UiTP/JSBvfezgXhyRiE=; b=CTZe1vXNFi0OV2+W154WTlV7N74CCZ1DZAt7QVVblPmX1hmULlKIc0UwB3xMKxzxFCdpgy 1M8WPXV58zXG8K87pzqyv4SyNfCLz/85MeIGegh6erIngdpy6OwgW/O94yueg85tGMAO2q ARw1smRK6Vk7e5EIk5PGYKIDdTlv+eo= X-MC-Unique: sUZtw12dNCusBwB2szLHXA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 10/12] audio: deprecate -soundhw hda Date: Wed, 29 Apr 2020 13:02:12 +0200 Message-Id: <20200429110214.29037-11-kraxel@redhat.com> In-Reply-To: <20200429110214.29037-1-kraxel@redhat.com> References: <20200429110214.29037-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=207.211.31.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 01:18:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add deprecation message to the audio init function. Signed-off-by: Gerd Hoffmann --- hw/audio/intel-hda.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index e8d18b7c5887..df4f13157d44 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -25,6 +25,7 @@ #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" +#include "qemu/error-report.h" #include "hw/audio/soundhw.h" #include "intel-hda.h" #include "migration/vmstate.h" @@ -1307,6 +1308,8 @@ static int intel_hda_and_codec_init(PCIBus *bus) BusState *hdabus; DeviceState *codec; =20 + warn_report("'-soundhw hda' is deprecated, " + "please use '-device intel-hda -device hda-duplex' instead= "); controller =3D DEVICE(pci_create_simple(bus, -1, "intel-hda")); hdabus =3D QLIST_FIRST(&controller->child_bus); codec =3D qdev_create(hdabus, "hda-duplex"); --=20 2.18.2 From nobody Sat May 18 18:02:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588158897; cv=none; d=zohomail.com; s=zohoarc; b=IqxUPmQghVQeqbRE4DwcdbqVaafPgc7q84CwtF5n1LW8C2L2/+hL2OYXpqHYWGwj3RKXrc0GpgZ6bDQ14uMdMqVG/8iKpZIyvmF98BU8Hk5FhWppdgOc8CrfUEkMdP7mjE6BY0A4TBI99yEtyBbGX7XoYB2OJ/GLHi1FbDF296o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588158897; h=Content-Type:Content-Transfer-Encoding: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=aUJCupT6IYh2WAx1L3nT6pq2CVSmwuP3AoQsjaYSYSs=; b=X2UkEPz5l9nkeaBN4yRCoOaqK+wbHdtkRAy7CmvQV+xJ3ZM2Vb04NGyKHiYPXwBSFg/noPX+OS1Yn1UnL/aEG//+JVbier5GMnFrlOY2ZsSdxpTmYQtX24NxRZkp8C95CQ/nqHRF0gkIvajKuExQcyI+5Lvsg0AeT2Dp4Gk1E20= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588158897690109.53980450401161; Wed, 29 Apr 2020 04:14:57 -0700 (PDT) Received: from localhost ([::1]:38400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkg2-0003a0-1w for importer@patchew.org; Wed, 29 Apr 2020 07:14:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44846) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkUy-0005C9-Tr for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTkU0-00044J-NX for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:28 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:41802 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTkTz-0003wm-OB for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:02:28 -0400 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-249--H-v5AYmNi6uwaLrclFEfA-1; Wed, 29 Apr 2020 07:02:23 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EF1DF835B41 for ; Wed, 29 Apr 2020 11:02:22 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA17C60BF4; Wed, 29 Apr 2020 11:02:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 689AE9DA6; Wed, 29 Apr 2020 13:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588158145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aUJCupT6IYh2WAx1L3nT6pq2CVSmwuP3AoQsjaYSYSs=; b=jJ3JssG9tdsOLWAAtZIve64eq5a2qm7BLVVi40y/HVk4bpkmoYEokQ690OuabNzuavbk5f fqVNSv2gFJvBlNbkdT47QuGAf90Df6PN3+aAFjVgK23qz9onDLiU7SAMhuaCv15bWOIt65 WW7I/PrL9QV8L6NFgB0kBbz1hHH9Q5w= X-MC-Unique: -H-v5AYmNi6uwaLrclFEfA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 11/12] audio: deprecate -soundhw pcspk Date: Wed, 29 Apr 2020 13:02:13 +0200 Message-Id: <20200429110214.29037-12-kraxel@redhat.com> In-Reply-To: <20200429110214.29037-1-kraxel@redhat.com> References: <20200429110214.29037-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=207.211.31.81; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 01:28:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 29dc00bf8dc7..72e7234d5f65 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.2 From nobody Sat May 18 18:02:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588158479; cv=none; d=zohomail.com; s=zohoarc; b=OwL1KcPSpwy9ttaNkESSQ84DVdQijf2war6FYBrQbs7yTajLgkAhHXTh7EBQa/7DAMxy/9G7g6bGjH9Bn73rHXQEjT4/8IXk48mWQHS5H6Paa+FzuEbqecZ4MApOcm/Qpy/Q8rT053ElugzX4dWF/Bcvl5UB8CYsrZ6qdDcownc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588158479; h=Content-Type:Content-Transfer-Encoding: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=wysf+f1EtfY025TMhPnFVBai53LDQXbfkwKHnviPwB8=; b=VnQmXAdFfELQM4s0U2CJ5w1dBGFn62CNga1qfVjr2+9mlDFz0ySxf3EejJNFYGmUEV6ZtBZyu+9uqfx4Wc/wi6U1HzrLE9kEk8fhhkpVxPKAQ0VfPf2X8El9KKY4EvDqCrB0K9cHBmbtAZyNtLVZougBEoeHH2K8DgI3AfFYqYw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588158479900775.8861076674118; Wed, 29 Apr 2020 04:07:59 -0700 (PDT) Received: from localhost ([::1]:47514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkZK-000375-D5 for importer@patchew.org; Wed, 29 Apr 2020 07:07:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44818) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTkUu-0005BH-Gq for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTkTw-0003rp-Gi for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:03:24 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:45440 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTkTw-0003n7-2o for qemu-devel@nongnu.org; Wed, 29 Apr 2020 07:02:24 -0400 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-512-7lqN7TLRMJmNqD9KiBjtLA-1; Wed, 29 Apr 2020 07:02:21 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3A2C1EC1A5 for ; Wed, 29 Apr 2020 11:02:20 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDBF65D9F1; Wed, 29 Apr 2020 11:02:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 70F3D9DA7; Wed, 29 Apr 2020 13:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588158143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wysf+f1EtfY025TMhPnFVBai53LDQXbfkwKHnviPwB8=; b=AJgGN09s2L4G0MBZ6Gc89BXb8GE9D89pIWZKUHITAWLOAoLzbNmHPyja2zljJ2gqnxzIAi IGkjHiPmOh2XatwHmcwsKBeGTVbgPV+waPDis/a07huwJt/LhxsmwnFkG8c4FX+TOyLKZ2 3fDcxM4/+qnNFZG5RIYkPjbRMkyMXzQ= X-MC-Unique: 7lqN7TLRMJmNqD9KiBjtLA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 12/12] [RFC] audio: try use onboard audiodev for pcspk Date: Wed, 29 Apr 2020 13:02:14 +0200 Message-Id: <20200429110214.29037-13-kraxel@redhat.com> In-Reply-To: <20200429110214.29037-1-kraxel@redhat.com> References: <20200429110214.29037-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 01:42:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" New naming convention: Use "onboard" audiodev for onboard audio devices. This patchs implements it for pcspk. If we want go this route we should do the same for other onboard audio devices too (arm boards, ...). Signed-off-by: Gerd Hoffmann --- hw/audio/pcspk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 72e7234d5f65..102cac21b3be 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -190,6 +190,9 @@ static void pcspk_realizefn(DeviceState *dev, Error **e= rrp) =20 isa_register_ioport(isadev, &s->ioport, s->iobase); =20 + if (!s->card.state) { + s->card.state =3D audio_state_by_name("onboard"); + } if (s->card.state) { pcspk_audio_init(s); } --=20 2.18.2