From nobody Fri Mar 29 08:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1592998258; cv=none; d=zohomail.com; s=zohoarc; b=dDHR1h1WdL1IeutaaOT1d6GmATGPOKbKJHhkK+CMF+5h7V1GaP+DQLVCNt03ccmbmbrpBal4u+CEL60bmIkSLmzMX0St79Bu+rf7bOtvt/ZwMx4cR0UGDR8g8Axx80IW+iCAVGil7tmaazbJ7eBWN9zi0PQKcTe+RjsKT0L2+jI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998258; 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=TblcahrtK9GAL2ZcADuEIqlUQPhrGCfzXjv5e1jl7J4=; b=gzws01SwvOd5xejh5li4o0CQcb6Gde6v3Nn8T4ELfahaPOv8GRLYsL7ogcZyATHxbJz/cwTiN4sAU2m4vrg9111mNi3aj7c6Ra7W6tKw0xXU8kIpe9VQh3i2jscGdYRP2/4RCzdJ+1FVS7q1va7asGezXadr1fTorzj3xufhnP0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 159299825884781.36009337773089; Wed, 24 Jun 2020 04:30:58 -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-270-P8ZvnDs2MpK9fCHHex6vfA-1; Wed, 24 Jun 2020 07:30:53 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 63CA9107ACF9; Wed, 24 Jun 2020 11:30:48 +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 4434A7168D; Wed, 24 Jun 2020 11:30:48 +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 126151806B0A; Wed, 24 Jun 2020 11:30:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUaEB028375 for ; Wed, 24 Jun 2020 07:30:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 443B279304; Wed, 24 Jun 2020 11:30:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76C2A512FE; Wed, 24 Jun 2020 11:30:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A208645DB; Wed, 24 Jun 2020 13:30:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998257; 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=TblcahrtK9GAL2ZcADuEIqlUQPhrGCfzXjv5e1jl7J4=; b=Kgm4G6b1sEDT8qdcouo5pDXFEJQvAbo6+A0phCpEEnuIvQv52xNfiQ2LF/q42YhspkzE03 Jkyc1u/iqhuYc7rkhIBVlojfOZdaVPRF9VCxiiEllRzt9Eip3jyOTL5A99EKoXHgRlCvCI 64QyZGjQxjNaMp/yPXfqk30sg65OI6s= X-MC-Unique: P8ZvnDs2MpK9fCHHex6vfA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 01/20] stubs: add isa_create_simple Date: Wed, 24 Jun 2020 13:30:07 +0200 Message-Id: <20200624113026.13343-2-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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..522f448997d4 --- /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) +{ + g_assert_not_reached(); +} diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 28e48171d1f3..869204668231 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -7,6 +7,7 @@ stub-obj-y +=3D fdset.o stub-obj-y +=3D gdbstub.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 monitor-core.o --=20 2.18.4 From nobody Fri Mar 29 08:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1592998249; cv=none; d=zohomail.com; s=zohoarc; b=ZpRyGPd+7f4xjrQOuv5c07h/GnRGlkCC7yXEL1hd6RL7RvaJdY7HezphWb7aeTJxsmqY0/11q/I9K2QgDdUEyYScmeC2PJqH5neoacUEkbE3DT+wTaE3NikCOWJ687SALhrRq4JlBp19wq9YA45kk3KaoZfu+fZOBOVJQ6BSpUE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998249; 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=Fxo3dbFBxieNlMytfnHAQZ3LI1U1CwPdO9VU35QwSe8=; b=lK0JIvqoquLFXT5q8mWg1GFJkz/wDTbZ9ml6WlhbGW5hlylEl71AVmcNnKVqtxv4369hvm05K7PkEDgvue/0Qzim7vkOjXpZJOPRRKdd2eveOA2re6d5fncwU1yVrHsOyJEEIJ9dnhL/FA1P85cBASsXdeuQpf97HpOtM5hdwQw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1592998249405539.2205141345177; Wed, 24 Jun 2020 04:30:49 -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-472-6FijkWOhNR6XrwgcDSOjUw-1; Wed, 24 Jun 2020 07:30:46 -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 F08D7805EE2; Wed, 24 Jun 2020 11:30:40 +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 D0C855C240; Wed, 24 Jun 2020 11:30:40 +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 D744F180954D; Wed, 24 Jun 2020 11:30:38 +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 05OBUagk028385 for ; Wed, 24 Jun 2020 07:30:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id AC4F95C296; Wed, 24 Jun 2020 11:30:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BA695C240; Wed, 24 Jun 2020 11:30:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id AB7CF97DC; Wed, 24 Jun 2020 13:30:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998248; 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=Fxo3dbFBxieNlMytfnHAQZ3LI1U1CwPdO9VU35QwSe8=; b=da5fGMFwVu/XFP2hedib8AFEWmiTrgTJ9SygegkLgqS2l7YIeZMxxJxhYgci+UElzZtam8 ZZFtMHc/WMBQEfHuvP/ZyXkLcwwMGQ5+PtkQneiM44XwKfmTiBf1OBnEvg+l6ogGJTuuzq ceO1QkFImEpAJ+gNhAN+ID6QEMY15p4= X-MC-Unique: 6FijkWOhNR6XrwgcDSOjUw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 02/20] stubs: add pci_create_simple Date: Wed, 24 Jun 2020 13:30:08 +0200 Message-Id: <20200624113026.13343-3-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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..a8932fa93250 --- /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) +{ + g_assert_not_reached(); +} diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 869204668231..5d61e0d0da5b 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -12,6 +12,7 @@ stub-obj-$(CONFIG_LINUX_AIO) +=3D linux-aio.o stub-obj-$(CONFIG_LINUX_IO_URING) +=3D io_uring.o stub-obj-y +=3D monitor-core.o stub-obj-y +=3D notify-event.o +stub-obj-y +=3D pci-bus.o stub-obj-y +=3D qmp_memory_device.o stub-obj-y +=3D qtest.o stub-obj-y +=3D ramfb.o --=20 2.18.4 From nobody Fri Mar 29 08:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1592998250; cv=none; d=zohomail.com; s=zohoarc; b=Uf+QPJzamjwQu+PcnVZykKInxXPZ8TzggNhrcTSaazfV/oaFTl0/IT1ERZNkpwi/qa80K9P4N4XDXhYh+30KYpbDTf3cCg0ZPkI7jO2WyqD08kwUwDZ+DraJ9SDAaFnCaVqX6f9hQOHtVQDEcxMD6KyLHQqpqIwBQYEH2BfcD44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998250; 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=zMOpcVUnJEc4LJFOQxqPXo76bEz8HhyTBI4AjEu4EkI=; b=OvA545ba/cBt3aUieYMrYg410kA8lV6UM+OMzePAsXSmiob+A6E87WRqWskXDM02OTfK+kit9sffDGTFkBGPu1yEbX4Vy9NPBVvs7PL+8EIi1M+iFhEgDT0oogg7Vj/JhYyQxF3PMyPGn8DC6P/Grx/8Jw8xbdZ8qxdEnhVMSjo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1592998250356212.44750493706124; Wed, 24 Jun 2020 04:30:50 -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-56-S5w96rTBPBG4ZvjXnkZ3yQ-1; Wed, 24 Jun 2020 07:30:46 -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 1B918800C60; Wed, 24 Jun 2020 11:30:41 +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 C943A7CADE; Wed, 24 Jun 2020 11:30:40 +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 AA4D01809547; Wed, 24 Jun 2020 11:30:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUaeE028380 for ; Wed, 24 Jun 2020 07:30:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 569997CADE; Wed, 24 Jun 2020 11:30:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 801991C8; Wed, 24 Jun 2020 11:30:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B5BBE59CC; Wed, 24 Jun 2020 13:30:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998249; 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=zMOpcVUnJEc4LJFOQxqPXo76bEz8HhyTBI4AjEu4EkI=; b=faXK5rPx/dXZJUB8LLTqbHcXrbnT3tyUOgm+iGz7vMG/yggW7uebtzmkqY1YE9F8/P0rd/ 02MT3KN6qnWYxmOPk8ZTDJiiYavG+3bnqOle8JMJhCWTrqvpIKn5MdfEZETtL85fHgBSqv Vbq5toaWCk5p/3KE+1GKkpsiN9b85tM= X-MC-Unique: S5w96rTBPBG4ZvjXnkZ3yQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 03/20] audio: add deprecated_register_soundhw Date: Wed, 24 Jun 2020 13:30:09 +0200 Message-Id: <20200624113026.13343-4-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.13 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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable 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.4 From nobody Fri Mar 29 08:50:11 2024 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=1592998261; cv=none; d=zohomail.com; s=zohoarc; b=bsza6fVWlGRFK042H00nim8fwjnv3lawW4zMAJnvgmMLCh8JKeLkNQVAI0AqKIOq/8u6TPmSWqkK8zkoX/BiLSYH8nNOysJdjc8AS5xw67JJYIJsSKa7IIbjpYB41iCe8Fmq8dnW3OhZOEWg5NtASIX1ybz8vLuerzKyq8EIAJg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998261; 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=1Vv9AT621ICkypcsTO25i0HBy7rRbjf8YKBPKUfrZtM=; b=B+NLsjWCa38nR+olhmJJ9NlweMzC2wzAg9lSfVLxge/6B57HlS5btYJnCJMeHGMIZ3mwK2bP3wcIs5XCmjVaFeyIV9H5lPtdlyzosw8Gm1RMQLv2KaZSG9L7w7tNRr8ukTETDD48IE/hIJn3TfveDUfXmXKBx1CzeZ9EaiRPDU8= 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-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1592998261531640.1866009790916; Wed, 24 Jun 2020 04:31:01 -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-331-m5xZ9nzPPKy2eFRxGSmpeA-1; Wed, 24 Jun 2020 07:30:58 -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 B533D805EF4; Wed, 24 Jun 2020 11:30:52 +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 8E2DD10027AA; Wed, 24 Jun 2020 11:30:52 +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 4993E1805310; Wed, 24 Jun 2020 11:30:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUbq4028422 for ; Wed, 24 Jun 2020 07:30:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id EA5837F49D; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 843CD7E59F; Wed, 24 Jun 2020 11:30:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C03CB6DE2; Wed, 24 Jun 2020 13:30:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998260; 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=1Vv9AT621ICkypcsTO25i0HBy7rRbjf8YKBPKUfrZtM=; b=QX/RUrLO+N0kHjijWKsFO5yRijYSuD7AT9z9YztYNX5jgzwg4iJT2TkFfTQjde1Fkhnxp6 +86LQ0LcfLTFysDDLYbpKJ8yCCpn0Ff7Zrn/S5AQn3zFT14Q5KiPUbE7gNutRIoONkgmgv bi+QHQEXtyOzlnQCsg150FFxFX767OE= X-MC-Unique: m5xZ9nzPPKy2eFRxGSmpeA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 04/20] audio: deprecate -soundhw ac97 Date: Wed, 24 Jun 2020 13:30:10 +0200 Message-Id: <20200624113026.13343-5-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.84 on 10.5.11.22 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" 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 8a9b9924c495..38522cf0ba44 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -1393,12 +1393,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 (), @@ -1436,7 +1430,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 22da107484c5..105d9792ecdf 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -53,6 +53,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.4 From nobody Fri Mar 29 08:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1592998274; cv=none; d=zohomail.com; s=zohoarc; b=L+v06gYDvOvS3fIzR/3QBseIoPwMWJpVeGTjApdDNdEhWNjdP5xF57Kj9b199dG6nFVvLtlja8/M5NcGIJjm6iZBhzzG3JcrveapQ1bzY7Ik16jHfuz7IMX6dte74wUaMCkqHOmBgpJu4OPshEgDNST9aZhgIvZyoClYU+to1kk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998274; 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=VrjkzeYjFVWx4CauFAh7J9oz+USZwYX0CXQbxUCKY7M=; b=Si8cuQu1r5nKY3MU9ZsyfzRQJHsBfl2qZ0CU99PhnB+hogZdkNxMTf4uCCFGDUMWdokt7xiVIXkjIINA1+Sybxq6AuzOv+oiNkD9EHKfYZGBpIyaNpNEtsN/CffnRPi8TJWVdcCwZetRd1XmlVZwPuW9qAFjjIMavgh+Dp2tcZY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1592998274136365.07778497775894; Wed, 24 Jun 2020 04:31:14 -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-71-OLpDsBCzOsSzoJ7qkv_uKQ-1; Wed, 24 Jun 2020 07:31:10 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6845C805EE6; Wed, 24 Jun 2020 11:31:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A6CC7931E; Wed, 24 Jun 2020 11:31:05 +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 1C41C876B2; Wed, 24 Jun 2020 11:31:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUjlU028536 for ; Wed, 24 Jun 2020 07:30:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id BA6C41010427; Wed, 24 Jun 2020 11:30:45 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id B60D510027AA; Wed, 24 Jun 2020 11:30:36 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id CAB396DE4; Wed, 24 Jun 2020 13:30:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998272; 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=VrjkzeYjFVWx4CauFAh7J9oz+USZwYX0CXQbxUCKY7M=; b=U+Nf/5SdBEFp6V69tImP9KAkydRrfWlPd7j6UZjcFyuad28v6du4GVBgFtvLD3SfIn04uJ mfS9NRLjbCV9ppOXcR6IsWQTqCdXnP4rSWV+CTo9Prgs/qQIbVdCRBO2XL/DYoU1cXKIo/ WwQxQgg1aUiEoE5BmwPec/jPjZeYGqo= X-MC-Unique: OLpDsBCzOsSzoJ7qkv_uKQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 05/20] audio: deprecate -soundhw es1370 Date: Wed, 24 Jun 2020 13:30:11 +0200 Message-Id: <20200624113026.13343-6-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.11 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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable 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 5f8a83ff5624..4255463a49ff 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -884,12 +884,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(), @@ -928,7 +922,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 105d9792ecdf..e3083fae394b 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -55,6 +55,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.4 From nobody Fri Mar 29 08:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1592998252; cv=none; d=zohomail.com; s=zohoarc; b=dIO/gWCrXFM0M4T4ByrBXqt12dBk/5tGV//Bc/8nD5SCKtfSOFDPUPTIehFFuHZOMAPWUZVZc2b10vdL5IYjHuQTyA3koVm0B2zwNIU/TlBCakrA1DYOiJkl4Ctuqa6OObEhV1X/6RpsPSS0fnt8AeRXbKTvPNB1LNERCO6Nnvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998252; 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=cp/2ui0tlH8lhPnT5RA7r+CowqQM6Y0K53DWdoQXRic=; b=Wa2yl5c2+PEIoJ3Mbgnsk4DKN1MyMrCxt/DrGX4Pz3G79amZ71K4CFCbvnKOmV4F/hhIqT7Ji2tY2vcYzUSootOpR0zWx+vte99ZlClfuoqPVwMXqilC2Wj08vFdU+kv2/MuN3Y07ZRbD1/m2xiIHSwdEod73BfA2cNrpQ21JDU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1592998252056873.697129635602; Wed, 24 Jun 2020 04:30:52 -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-472-J6c1r3h-NYKJ1hPX_D0ZSA-1; Wed, 24 Jun 2020 07:30:46 -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 199D7805EE3; Wed, 24 Jun 2020 11:30:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C4F366106A; Wed, 24 Jun 2020 11:30:40 +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 D2759104912; Wed, 24 Jun 2020 11:30:38 +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 05OBUb9S028390 for ; Wed, 24 Jun 2020 07:30:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 004065C5D9; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id B15A95C240; Wed, 24 Jun 2020 11:30:36 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D3AA959D8; Wed, 24 Jun 2020 13:30:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998250; 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=cp/2ui0tlH8lhPnT5RA7r+CowqQM6Y0K53DWdoQXRic=; b=YBJC0yKnHjblsKCCimqllKRQOrt53SKg9m0U1+spg6rI62W1CuXDFt7i2FNjXE6JZLAQay 7RpmTQEszddJtpC6ZAUtou4l63TaAPlfiEmP0KBYidb9TQXSZDPJgjsJrwcTaxJm7yqgQ4 6fvaQdq0Cja0n1MUCIF3PJVUIKQI8RY= X-MC-Unique: J6c1r3h-NYKJ1hPX_D0ZSA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 06/20] audio: deprecate -soundhw adlib Date: Wed, 24 Jun 2020 13:30:12 +0200 Message-Id: <20200624113026.13343-7-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.12 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" 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 7c3b67dcfb8c..65dff5b6fca4 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -319,16 +319,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.4 From nobody Fri Mar 29 08:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1592998277; cv=none; d=zohomail.com; s=zohoarc; b=QpZ4MKicMS38WNnS1UGjTq3AE45Ski9FC68P9QvPwVJNsIxnbJTEXrq/9f6xEtxWE47MXqN4kFg8xW+ZXWJrRRB27poQWFg8x/3KsgSkUz0KyqdZX1VIPk+jlCU245H58i+LlRDHZa88+iq0jEpr4DYu2Ql0QSlMdzJh9RyXI9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998277; 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=xNpDDsbbHHbzoy9YLA4tgd22/EHd97ILJm3ZhW/keJM=; b=kZju6ajSjZZ/rmTG7Q5r5DPskBWUd8GsA1chbmk0w/AtkeFAHMMS9MCrb41nYpGEI18rBTCkz0y9DEjkR0140KYt2Mp26wQzwjB/EHZH7H8AavU2iHfMqrMAUATfH4b6LypCqwSMsr8D9Zh0/Q7l6w30L4IJiGyWGN/exVIgNGY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1592998277442644.8962989530594; Wed, 24 Jun 2020 04:31:17 -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-138-oBVz1fPmPBW1L9Vc5heZ1g-1; Wed, 24 Jun 2020 07:31:13 -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 A4475A0BDF; Wed, 24 Jun 2020 11:31:07 +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 8707718216; Wed, 24 Jun 2020 11:31:07 +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 55D6A1806B0A; Wed, 24 Jun 2020 11:31:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUjUT028540 for ; Wed, 24 Jun 2020 07:30:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id C5C881010428; Wed, 24 Jun 2020 11:30:45 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 010DE100EBDB; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id DC8DC31E22; Wed, 24 Jun 2020 13:30:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998276; 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=xNpDDsbbHHbzoy9YLA4tgd22/EHd97ILJm3ZhW/keJM=; b=LzmnvA1dd1Mi8G7ivuFadsvlJMvOiCFf1ipqinCsOIMfgYEm+5YEBhHlR9y6DpngmdUqqk vs4n0ZjrTj6eyMdPUgjWvkezDLwnrYQiXek2luHmXocSlnA0CZZEUACoIdLz9uhaa0qgYG ZLRFlUMIG5cGwGjBRrEfQztGkLS0yOY= X-MC-Unique: oBVz1fPmPBW1L9Vc5heZ1g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 07/20] audio: deprecate -soundhw cs4231a Date: Wed, 24 Jun 2020 13:30:13 +0200 Message-Id: <20200624113026.13343-8-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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" 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.4 From nobody Fri Mar 29 08:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1592998386; cv=none; d=zohomail.com; s=zohoarc; b=jw1lL+AGcsuX11TQdi0lP23j8WVOcSM0RGOGVopLZMbcQ7QNn2KEiAw0GbpbLM5pYgBb+vNjn3hwtgFz5O19fIfYCi5cdqikk6Jm3c+n4mpT40ZdeXLpHWsOMZOBi+uNCShgerkmJjUtJvWO+CS8T7BlVaIqaCGdho2RfWlhP3I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998386; 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=gVUjyxcdLlcziLhdHf0nYU2aUMoIqN9LBjMS0HaSfgs=; b=IHi+lZKGlT93TfvvsndD8s5WvDfhf/x7CeWj8Lt0CxFQrpRmF3ZVzOP/ZDfdQr1H0FJIgJZS2jckCCWpU04jQ8//OLGnsI6rf5Bxl+Z3MACug9y6xybFEXTSsLNPKZNqxb0P2UmU5/Oswso5cByKVKLB060lbOEpuOOdJNJL9CI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1592998386801671.8898918307669; Wed, 24 Jun 2020 04:33:06 -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-234-sD26sqyMOBar-LCVluDeqg-1; Wed, 24 Jun 2020 07:31:08 -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 3711118A8227; Wed, 24 Jun 2020 11:31:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 17B3A18216; Wed, 24 Jun 2020 11:31:03 +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 DDA76876AD; Wed, 24 Jun 2020 11:31:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUjHK028526 for ; Wed, 24 Jun 2020 07:30:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 70FEB2B476; Wed, 24 Jun 2020 11:30:45 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 057001A836; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E563931E28; Wed, 24 Jun 2020 13:30:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998385; 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=gVUjyxcdLlcziLhdHf0nYU2aUMoIqN9LBjMS0HaSfgs=; b=Gk7jo+dFC1kPSGwoCfCETzZnLffGchbk+wm7a6miCxTtDRZOWXi63zLYkIXNymslVvQD1V /KLeZXuT3H/EkAV9SB3RITbxde+bIhNlDpzPavX593sYT7rM/ayooLpP3VTNukFOWuKQ+W Pw4qRm+6fR8nrWWKwunf6xFXsaMU47k= X-MC-Unique: sD26sqyMOBar-LCVluDeqg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 08/20] audio: deprecate -soundhw gus Date: Wed, 24 Jun 2020 13:30:14 +0200 Message-Id: <20200624113026.13343-9-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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" 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 c8df2bde6b32..7e4a8cadad6f 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -286,12 +286,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), @@ -322,7 +316,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.4 From nobody Fri Mar 29 08:50:11 2024 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=1592998263; cv=none; d=zohomail.com; s=zohoarc; b=dBdmuDBLHuwYfmBoM2H4+ygiIgbVYfKlCRLzZxbAcW5Fru7Pz5QAw3PI6Y8NBANwIERN1qcvWZ3boPlpJeoaRqdL6HzkTBmPB3qhtSAwKIim7jNtba2qE/a6SR3rsA8C8OhVfPXGwgnr2ehnjUScBsod3+bbPaFnujzDTUS5JNw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998263; 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=d/a9Ntks1qykABzxoA+2KUfIStVfCwWOvIGdJEEdgOA=; b=JlGiMBGWoayGfcXkxA/JwAzKbOhalYeYqoXyHsYEnHStTREvnIvEbE0K/2q7yzqQbwWQHxEM001BbfBm2DUIqNSqsnaZaILmN7vNIXSyJFOrekmDOCuyP9QEkZxf6l18irNyFH41wtnM9ZED6cTmukeru+RAL9AD5f1yCZhHqYw= 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-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1592998263097387.27265509147605; Wed, 24 Jun 2020 04:31:03 -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-101-yNj98lacNCC0Dt7xLLT86g-1; Wed, 24 Jun 2020 07:30:59 -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 1F57D18A822A; Wed, 24 Jun 2020 11:30:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EBC3C10027AA; Wed, 24 Jun 2020 11:30:52 +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 BD7E91CA6; Wed, 24 Jun 2020 11:30:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUbML028396 for ; Wed, 24 Jun 2020 07:30:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 59E997CADB; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 13BA3579A3; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id EE29831E2A; Wed, 24 Jun 2020 13:30:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998261; 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=d/a9Ntks1qykABzxoA+2KUfIStVfCwWOvIGdJEEdgOA=; b=XSLcTM+DEngTW6gzU7A2EMusYklnfM2Uo7o/m6yBOiBcG+Jisw4lT4hyyGI2LlKyXZ5sci Gz6S8luQW2ySnd1LhhPmxj14sarT4WNpHmvnGmJOGPwooYytixdW2e2wyLEODqNDgi2x31 APzStuw+alTG4z+9kFwKmmLzus3jvdU= X-MC-Unique: yNj98lacNCC0Dt7xLLT86g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 09/20] audio: deprecate -soundhw sb16 Date: Wed, 24 Jun 2020 13:30:15 +0200 Message-Id: <20200624113026.13343-10-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.84 on 10.5.11.22 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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable 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.4 From nobody Fri Mar 29 08:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1592998329; cv=none; d=zohomail.com; s=zohoarc; b=R9UeilyN47hrFTSSoKlUzVPDJN/CCGnnv2EnDq2gfEcl3zkQ9UxpipsvEBH9bsqwvjAZrnWu/aoAYVXcwcjpKe+37QS+CbpV5ud4VDe/06x32QbSTNUmwWsHj6MnTqUmR9Ei03VRR5WLWoYS3KSXiyoNqWFQB68/1WEuen8uTB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998329; 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=fanjKxgAK/LsGTnft9MxiyfjNtB5nsw2oHCpiHFskdw=; b=TKJ/LP/4FVhGWbjnfx8BGqTfRJ5LaIcxeytAWJAuqYNp8KYqaIypY5kixFC79vZGOUrJmWzMxcDAy6psRsIOd+GXVVMxkibjTsrgogcxFDdaJfxVhRX5Ag4zm4f9htSVkjy3FoHQa1ZoBZT+M7/sIeOykmYulCdsy5jROJY0Upg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1592998329673859.4942263124012; Wed, 24 Jun 2020 04:32:09 -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-377-A8bRQipFP9GeXGc1r3LnTw-1; Wed, 24 Jun 2020 07:31:05 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 531EFA0BDC; Wed, 24 Jun 2020 11:30:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 330997FE95; Wed, 24 Jun 2020 11:30:56 +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 0860A876A8; Wed, 24 Jun 2020 11:30:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUbmr028399 for ; Wed, 24 Jun 2020 07:30:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6496E79304; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D2BF512FE; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 02C4431E32; Wed, 24 Jun 2020 13:30:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998328; 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=fanjKxgAK/LsGTnft9MxiyfjNtB5nsw2oHCpiHFskdw=; b=L8A+pkl3o5bzMbI41+Sn/ULNuCMf/vgCNy6njwVEu8VdCafdsWMNM4SCmR0Ga4qSpvOKuH LpIEO0XrJBTQPRU8M6cTFLA9mC379B9YpwE3KLz2XzTS5bM2BTBNGGy7xnLEYQVrxMkXtK BVp6wRStNkaQwpWw5Oc0GRd6gaWOOSw= X-MC-Unique: A8bRQipFP9GeXGc1r3LnTw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 10/20] audio: deprecate -soundhw hda Date: Wed, 24 Jun 2020 13:30:16 +0200 Message-Id: <20200624113026.13343-11-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.15 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. 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 f673b8317a84..f6cea49686d7 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_new("hda-duplex"); --=20 2.18.4 From nobody Fri Mar 29 08:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1592998330; cv=none; d=zohomail.com; s=zohoarc; b=jl7abhQQW/YXQnKK/zrYMX71IPxbw6FG8b8BdtesK/q76FLbJVFO0yzVD3HsHrkObDpAB2y4LmOPTb2dS8/O+AE7MQwh+z/QPx+ZTIpznKued9s7n/4woL3flzTOKph21lAh36rrOQdB5o01wLiIwG57r5sUjlYqV6qXzM4XUpk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998330; 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=gfBuyfc7G/vlLWwnGPkLgANWNVQeAFkuNQv715t1Kgg=; b=HK6+YAI4FGUwKUy7zLz6zGLQvS8vxiySSQmbELAwL3L4/SI3zo8NjQadlurPIQ336wAQEr0Rp0e6/yIJRJLis8aVJDl/w/6ZiWtyz7pfTzLzXhkc1yYeDblzqqffQ6zC++Z/4ggtsAhNCADW4fFvl9RWE/gsEPvFA1kLwH5KBY4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 159299833019841.135272936468596; Wed, 24 Jun 2020 04:32:10 -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-410-3QhYVEykM5iBvGEKuRCV8Q-1; Wed, 24 Jun 2020 07:31:05 -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 8D685805EFC; Wed, 24 Jun 2020 11:30:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6CD9B1C8; Wed, 24 Jun 2020 11:30: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 3DC3B876AC; Wed, 24 Jun 2020 11:30:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUbnu028411 for ; Wed, 24 Jun 2020 07:30:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id BEF6079304; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68B17512FE; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 109D231E3F; Wed, 24 Jun 2020 13:30:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998328; 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=gfBuyfc7G/vlLWwnGPkLgANWNVQeAFkuNQv715t1Kgg=; b=Av2PvnOeubwqND6Y6aj1zc58/Zc65QiDqGnTSx/iMTKzJHftBhelG7jxaMOvymkcslFIGD mQNKrFva8kCv9kTKFFsmUR+O894HpGYyLFlm4IKYEaWw772gHcF0Xhcla2piPPGWfnd2jd UfOlnIXveh8HBiJaddfU2M8DLk7K/HI= X-MC-Unique: 3QhYVEykM5iBvGEKuRCV8Q-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 11/20] pc_basic_device_init: pass PCMachineState Date: Wed, 24 Jun 2020 13:30:17 +0200 Message-Id: <20200624113026.13343-12-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.13 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" Need access to pcms for pcspk initialization. Just preparation, no functional change. Signed-off-by: Gerd Hoffmann --- include/hw/i386/pc.h | 3 ++- hw/i386/pc.c | 3 ++- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index e6135c34d656..9b94926410c0 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -160,7 +160,8 @@ void pc_memory_init(PCMachineState *pcms, MemoryRegion **ram_memory); uint64_t pc_pci_hole64_start(void); DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); -void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, +void pc_basic_device_init(struct PCMachineState *pcms, + ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, bool create_fdctrl, bool no_vmport, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index d103b8c0ab82..9afb003dfc21 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1176,7 +1176,8 @@ static void pc_superio_init(ISABus *isa_bus, bool cre= ate_fdctrl, bool no_vmport) g_free(a20_line); } =20 -void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, +void pc_basic_device_init(struct PCMachineState *pcms, + ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, bool create_fdctrl, bool no_vmport, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 1497d0e4ae94..605252fe7936 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -235,7 +235,7 @@ static void pc_init1(MachineState *machine, } =20 /* init basic PC hardware */ - pc_basic_device_init(isa_bus, x86ms->gsi, &rtc_state, true, + pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, true, (pcms->vmport !=3D ON_OFF_AUTO_ON), pcms->pit_ena= bled, 0x4); =20 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 46cd06524c68..e4b15f27227a 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -275,7 +275,7 @@ static void pc_q35_init(MachineState *machine) } =20 /* init basic PC hardware */ - pc_basic_device_init(isa_bus, x86ms->gsi, &rtc_state, !mc->no_floppy, + pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, !mc->no_fl= oppy, (pcms->vmport !=3D ON_OFF_AUTO_ON), pcms->pit_ena= bled, 0xff0104); =20 --=20 2.18.4 From nobody Fri Mar 29 08:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1592998324; cv=none; d=zohomail.com; s=zohoarc; b=WEEttbhJ49A6z4Rb6NtciwrQewjN1cnu0GkmnJCKnA6qV5FHuUwARJG4IKo8QGKtEKnGUmbImlywr3yXYEC4kClehYhKvzEf1MZrq8JiNBktslgEhKyAlweWR+WnUUnMMPSt+Lp9PPkFaIiJ2pHzgzz1dt0lLDdviw+G8sWrICw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998324; 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=1Q7npfp7pBdZV5AqIfLpiFnKGUenub9kzRD4QTal6XE=; b=lKKhFqfIonTdm+Xofrf5vXOpt2oiv+5nPWvsIh6pnfGng7+oiRmFLC8+NJC/nuOzUsdHEO3iQTAJZexCwYBaKDQSWptzFP5Uspvm1fXrzd4pmZtyccoIF+kaPUG2JeV8x/KIOknEP9VYZzR+Z0F+m/pvVsA3bO49NEBgJ7EwWTs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 15929983240501011.5629586656182; Wed, 24 Jun 2020 04:32:04 -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-266-Mive39WRNm6OfZ6XIbtLpw-1; Wed, 24 Jun 2020 07:30:55 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6B9A2100CCCB; Wed, 24 Jun 2020 11:30:50 +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 48FE17168D; Wed, 24 Jun 2020 11:30:50 +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 ED733180597C; Wed, 24 Jun 2020 11:30:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUbur028417 for ; Wed, 24 Jun 2020 07:30:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id D159C61984; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D57B6106A; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1E66031E43; Wed, 24 Jun 2020 13:30:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998322; 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=1Q7npfp7pBdZV5AqIfLpiFnKGUenub9kzRD4QTal6XE=; b=hvkD6IxLmEQnFExG2kcNNVIvXSBPW11jE8+DhxcGHjjYTBcN1xjlxVo82cOxPHjcCkWZX8 e0lZQKRNBFHqAeyIpnyTlpFPt9Bj3/zLvKI7YWpfWGK6cxAvuJb2U6MTKFv8xsXu8+iGU5 EkMK9H3SJFeey3QycoxQBLJ+Jab6IWk= X-MC-Unique: Mive39WRNm6OfZ6XIbtLpw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 12/20] pc_basic_device_init: drop has_pit arg Date: Wed, 24 Jun 2020 13:30:18 +0200 Message-Id: <20200624113026.13343-13-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.11 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" Now that we pass pcms anyway, we don't need the has_pit arg any more. No functional change. Signed-off-by: Gerd Hoffmann --- include/hw/i386/pc.h | 1 - hw/i386/pc.c | 3 +-- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9b94926410c0..3512dcfd3d27 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -165,7 +165,6 @@ void pc_basic_device_init(struct PCMachineState *pcms, ISADevice **rtc_state, bool create_fdctrl, bool no_vmport, - bool has_pit, uint32_t hpet_irqs); void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd); void pc_cmos_init(PCMachineState *pcms, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 9afb003dfc21..dfe8ba07e982 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1181,7 +1181,6 @@ void pc_basic_device_init(struct PCMachineState *pcms, ISADevice **rtc_state, bool create_fdctrl, bool no_vmport, - bool has_pit, uint32_t hpet_irqs) { int i; @@ -1232,7 +1231,7 @@ void pc_basic_device_init(struct PCMachineState *pcms, =20 qemu_register_boot_set(pc_boot_set, *rtc_state); =20 - if (!xen_enabled() && has_pit) { + if (!xen_enabled() && pcms->pit_enabled) { if (kvm_pit_in_kernel()) { pit =3D kvm_pit_init(isa_bus, 0x40); } else { diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 605252fe7936..1242ed811804 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -236,7 +236,7 @@ static void pc_init1(MachineState *machine, =20 /* init basic PC hardware */ pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, true, - (pcms->vmport !=3D ON_OFF_AUTO_ON), pcms->pit_ena= bled, + (pcms->vmport !=3D ON_OFF_AUTO_ON), 0x4); =20 pc_nic_init(pcmc, isa_bus, pci_bus); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index e4b15f27227a..25dc40896673 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -276,7 +276,7 @@ static void pc_q35_init(MachineState *machine) =20 /* init basic PC hardware */ pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, !mc->no_fl= oppy, - (pcms->vmport !=3D ON_OFF_AUTO_ON), pcms->pit_ena= bled, + (pcms->vmport !=3D ON_OFF_AUTO_ON), 0xff0104); =20 /* connect pm stuff to lpc */ --=20 2.18.4 From nobody Fri Mar 29 08:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1592998257; cv=none; d=zohomail.com; s=zohoarc; b=em3q6eSb5X2FX/e+1hAF9FWTWG4tWvtXN6ePcljsLZLj9Lcfa/sjlUcqwRjt1Z6L7XFvCAPhe8k3nI4shMpKb9yq5fXGkgPtC/0h9CxPwwba+Vd4PaNVQjNl7rC+lbHPDx7haldld0pr0QHoeFDuxp7U6ZBnkvSum7OSzpljcOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998257; 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=y8oK1IS+EFYwCrcadvYwCaYeNhaoALj922vvoKka4WM=; b=dZcbBg6RON/nwuB7BQKXRj57eBx7MH7xQeCCNGGOAt558TWqDWw5L+LgqP5O2KYRK15BaQw2tD54elVes/1nZ0zYKmiRvLBPwqW9Udb/TpAzbcDRes+tc4b3RpeW3kYxBED12wvs6BD6ac5vlDRE5BUqK8HZp7MGxel3bfVr+ZU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1592998257721642.3313554490186; Wed, 24 Jun 2020 04:30:57 -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-486-3NY99SH1Pyy2l_xE9HqAoQ-1; Wed, 24 Jun 2020 07:30:53 -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 EBB9F805EF1; Wed, 24 Jun 2020 11:30:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CC7435C6BD; Wed, 24 Jun 2020 11:30:47 +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 A07D5104918; Wed, 24 Jun 2020 11:30:47 +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 05OBUbcU028406 for ; Wed, 24 Jun 2020 07:30:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id AE3255C290; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63D825C660; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2C75631E47; Wed, 24 Jun 2020 13:30:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998255; 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=y8oK1IS+EFYwCrcadvYwCaYeNhaoALj922vvoKka4WM=; b=Wf/RFMEIZsQuue4h48nEA05sBwG1xUDpDcy7yy+TUf9YQweiOV1Qk0xlWb/0JZHLoppz9k 0iEJRGfYPemgADxh1oSuunq0uBd3UN4vkrvc3zPwVu72wVdt+0UFuojczSPKKtCZyWXCiD 4rUMhBoF5p80BPGPVlm2ADjoiKI6sAo= X-MC-Unique: 3NY99SH1Pyy2l_xE9HqAoQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 13/20] pc_basic_device_init: drop no_vmport arg Date: Wed, 24 Jun 2020 13:30:19 +0200 Message-Id: <20200624113026.13343-14-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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" Now that we pass pcms anyway, we don't need the no_vmport arg any more. No functional change. Signed-off-by: Gerd Hoffmann --- include/hw/i386/pc.h | 1 - hw/i386/pc.c | 3 +-- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 3512dcfd3d27..283754f42bd5 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -164,7 +164,6 @@ void pc_basic_device_init(struct PCMachineState *pcms, ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, bool create_fdctrl, - bool no_vmport, uint32_t hpet_irqs); void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd); void pc_cmos_init(PCMachineState *pcms, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index dfe8ba07e982..ba88e1dfb80f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1180,7 +1180,6 @@ void pc_basic_device_init(struct PCMachineState *pcms, ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, bool create_fdctrl, - bool no_vmport, uint32_t hpet_irqs) { int i; @@ -1247,7 +1246,7 @@ void pc_basic_device_init(struct PCMachineState *pcms, i8257_dma_init(isa_bus, 0); =20 /* Super I/O */ - pc_superio_init(isa_bus, create_fdctrl, no_vmport); + pc_superio_init(isa_bus, create_fdctrl, pcms->vmport !=3D ON_OFF_AUTO_= ON); } =20 void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 1242ed811804..2752b108001c 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -236,7 +236,6 @@ static void pc_init1(MachineState *machine, =20 /* init basic PC hardware */ pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, true, - (pcms->vmport !=3D ON_OFF_AUTO_ON), 0x4); =20 pc_nic_init(pcmc, isa_bus, pci_bus); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 25dc40896673..b8c8eaa691f6 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -276,7 +276,6 @@ static void pc_q35_init(MachineState *machine) =20 /* init basic PC hardware */ pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, !mc->no_fl= oppy, - (pcms->vmport !=3D ON_OFF_AUTO_ON), 0xff0104); =20 /* connect pm stuff to lpc */ --=20 2.18.4 From nobody Fri Mar 29 08:50:11 2024 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=1592998269; cv=none; d=zohomail.com; s=zohoarc; b=F9XE2Ip/cMXVZN94gFZ+n2YNPtH3ctP7J3DS07tCDsREVTQ2uBGoUeIlz6acXmZe+HhdHjBz5f1x01ogQS0OOxOnL/BZ3dllrMyHMYk56hVYgXek9MLGJvEf63bmkLdX4k2HfSrHHnW19fajJvx/tLS1x8jCCyk2s0twHAFVBJg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998269; 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=0EXJ8NYt40ZdOwU8P9DCLv07anDNn+TKTHDnSwUu9wQ=; b=khTfgc0PGpmJfCh5bZyY+lNb+LeJy7BcWN+BT2Lvl/Hpg5shjONtME4cDv7fTZHPNdZfViCU4NEfe+ZG0GgTNKHQF+qTxahv8TeMy1aLcerUFrrcOKXbf1S57Ru//m3MOMevsnxoFWDROJGdecFAJTZwE0wEx/V2HuYnZ98VLRI= 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 1592998269655481.33790121836284; Wed, 24 Jun 2020 04:31:09 -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-249-18hqUPExOrWiT7tssaRhEg-1; Wed, 24 Jun 2020 07:31:05 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 29AF88064B4; Wed, 24 Jun 2020 11:30: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 0ADD77931E; Wed, 24 Jun 2020 11:30: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 CF5801805317; Wed, 24 Jun 2020 11:30:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUjrX028531 for ; Wed, 24 Jun 2020 07:30:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7EE482B4A5; Wed, 24 Jun 2020 11:30:45 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA8D31A8F7; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 356BF31E4A; Wed, 24 Jun 2020 13:30:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998268; 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=0EXJ8NYt40ZdOwU8P9DCLv07anDNn+TKTHDnSwUu9wQ=; b=hivr97UsB0iG2UHJsAkKxgo2Fk1PmGSp550C+4RU9e2vu7X4gSobqn6ZNF79kCrOuyiMrD ZLFL/7cb8pFNwNtWOd08TQCnyd26dTgr5tlwHV3sqIO2/D3yWD5Al+1/WQkY94KFoQZCrZ sGF17u8A/H2gfBSd/b0/qdZIQQyCw0Y= X-MC-Unique: 18hqUPExOrWiT7tssaRhEg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 14/20] softmmu: initialize spice and audio earlier Date: Wed, 24 Jun 2020 13:30:20 +0200 Message-Id: <20200624113026.13343-15-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.11 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" audiodev must be initialized before machine_set_property so the machine can have audiodev property aliases. spice must initialize before audiodev because the default audiodev is spice only in case spice is actually enabled. Signed-off-by: Gerd Hoffmann --- softmmu/vl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index f669c06ede4a..3bfb9d29fd60 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -4131,12 +4131,17 @@ void qemu_init(int argc, char **argv, char **envp) fsdev_init_func, NULL, &error_fatal); #endif =20 + /* spice needs the timers to be initialized by this point */ + /* spice must initialize before audio as it changes the default auiode= v */ + qemu_spice_init(); + /* - * Note: we need to create block backends before + * Note: we need to create audio and block backends before * machine_set_property(), so machine properties can refer to * them. */ configure_blockdev(&bdo_queue, machine_class, snapshot); + audio_init_audiodevs(); =20 machine_opts =3D qemu_get_machine_opts(); qemu_opt_foreach(machine_opts, machine_set_property, current_machine, @@ -4230,9 +4235,6 @@ void qemu_init(int argc, char **argv, char **envp) semihosting_arg_fallback(kernel_filename, kernel_cmdline); } =20 - /* spice needs the timers to be initialized by this point */ - qemu_spice_init(); - cpu_ticks_init(); =20 if (default_net) { @@ -4342,8 +4344,6 @@ void qemu_init(int argc, char **argv, char **envp) create_default_memdev(current_machine, mem_path); } =20 - audio_init_audiodevs(); - /* from here on runstate is RUN_STATE_PRELAUNCH */ machine_run_board_init(current_machine); =20 --=20 2.18.4 From nobody Fri Mar 29 08:50:11 2024 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=1592998258; cv=none; d=zohomail.com; s=zohoarc; b=PNF+sYtWnpJT1RcPVw2tkJaftM0zhWFpZm6xra52h/oMTyvoMfPDeZvdqtGOqwDqgKlvGHBrKhiwbfKPNbMHOrZwVQnd6RT5LCIpHo9ueIAhvbHGdU3ZWmV4ENiomhgCia12aFWuDk77tXCElIg1XnQYXQsfT1CyoGBESwoYLOo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998258; 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=W5jLchuDEVC4h32xQx4FbHLLABhySJXQUN1JP811Qec=; b=HTiTa94WsJhoWZ/zQsmaf2PX1Aoznqfp+RLJy3Pv6Xa0ZD410ngcDoHQiAfJPuBSfo6seRznydXuTOIWBVdOmmUxwsFGMFRvGcu69eow7h3RQ4kLhoZfLSxlTGFbta1HpMlsQEhwfwx3bnbQf2O9x3NunQDf/4XyqZ6JpgGs0Rc= 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 1592998258091658.8275825216617; Wed, 24 Jun 2020 04:30:58 -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-31-luCA8XsMN7yVW-8w5HPKQg-1; Wed, 24 Jun 2020 07:30:54 -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 36F768015FB; Wed, 24 Jun 2020 11:30:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 15BFD1ED; Wed, 24 Jun 2020 11:30:49 +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 DD96F104918; Wed, 24 Jun 2020 11:30:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUcer028428 for ; Wed, 24 Jun 2020 07:30:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2454B7CADE; Wed, 24 Jun 2020 11:30:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id D09E91C8; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 41B0B31E57; Wed, 24 Jun 2020 13:30:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998256; 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=W5jLchuDEVC4h32xQx4FbHLLABhySJXQUN1JP811Qec=; b=Bdb4QssESfPyFbLBWguvAH/RRS8rMFrNJEduNlOjN+kF/4iSFFub0LjzuFiXdP/PTy/UCW PHmtM0Wa8alm2J80Xy5lSbao9wdOUf1yNa4YJC/F0RBNp8tMoE27jif0EpE+K7LO3nVuVr lRcB8NU4LVyXf+95gBg00sSRrANjGxY= X-MC-Unique: luCA8XsMN7yVW-8w5HPKQg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 15/20] audio: rework pcspk_init() Date: Wed, 24 Jun 2020 13:30:21 +0200 Message-Id: <20200624113026.13343-16-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.12 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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of creating and returning the pc speaker accept it as argument. That allows to rework the initialization workflow in followup patches. Signed-off-by: Gerd Hoffmann --- include/hw/audio/pcspk.h | 6 +----- hw/i386/pc.c | 2 +- hw/isa/i82378.c | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h index 7e7f5f49dcb0..8b485602675f 100644 --- a/include/hw/audio/pcspk.h +++ b/include/hw/audio/pcspk.h @@ -31,18 +31,14 @@ =20 #define TYPE_PC_SPEAKER "isa-pcspk" =20 -static inline ISADevice *pcspk_init(ISABus *bus, ISADevice *pit) +static inline void pcspk_init(ISADevice *isadev, ISABus *bus, ISADevice *p= it) { DeviceState *dev; - ISADevice *isadev; =20 - isadev =3D isa_new(TYPE_PC_SPEAKER); dev =3D DEVICE(isadev); qdev_prop_set_uint32(dev, "iobase", 0x61); object_property_set_link(OBJECT(dev), OBJECT(pit), "pit", NULL); isa_realize_and_unref(isadev, bus, &error_fatal); - - return isadev; } =20 #endif /* HW_PCSPK_H */ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ba88e1dfb80f..3f1d42b05102 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1240,7 +1240,7 @@ void pc_basic_device_init(struct PCMachineState *pcms, /* connect PIT to output control line of the HPET */ qdev_connect_gpio_out(hpet, 0, qdev_get_gpio_in(DEVICE(pit), 0= )); } - pcspk_init(isa_bus, pit); + pcspk_init(isa_new(TYPE_PC_SPEAKER), isa_bus, pit); } =20 i8257_dma_init(isa_bus, 0); diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index d9e6c7fa0096..75a2da288157 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -102,7 +102,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp) pit =3D i8254_pit_init(isabus, 0x40, 0, NULL); =20 /* speaker */ - pcspk_init(isabus, pit); + pcspk_init(isa_new(TYPE_PC_SPEAKER), isabus, pit); =20 /* 2 82C37 (dma) */ isa_create_simple(isabus, "i82374"); --=20 2.18.4 From nobody Fri Mar 29 08:50:11 2024 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=1592998263; cv=none; d=zohomail.com; s=zohoarc; b=BdUFRfT6UnIaZnz98e2g/agx03UJPoTIhu4BAxNDiy4CPNgUE5fGM/KKXu4waLFcywGChjd5VFxv8YlZZLtqUsDM4j+BMzMY4+kw4m/0AUcgsBGXZuJey07/0cqTEL5HQbUbtdAt9eZXJXvzlgpBBDPzwNnslI5P6efHmjEbJXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998263; 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=kIQJ9CeCtEXcjwf/+kopOsW4htznwXBp1TsGYYUobMk=; b=LEomEICZTDxG9EixM1Qa4Gnhq3sNZMzgy0DS9myWpwrYKxm9MfoOZiDakb2nJfkxcKWfXUP9kAB19COVz0PeazM7arD53pLU+E38DWYX1DVQgMMPaZrm/kAm0XHJot0laPC/O3cZKG4vS7IdrZR2fCG49ZrnVRywcJUNVonuEn4= 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-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1592998263947114.29419468453386; Wed, 24 Jun 2020 04:31:03 -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-355-3tawXdDRMMa7cskPN1Su2A-1; Wed, 24 Jun 2020 07:31:00 -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 BAC41805EF6; Wed, 24 Jun 2020 11:30:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9891D1C8; Wed, 24 Jun 2020 11:30:53 +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 6C3FD876A1; Wed, 24 Jun 2020 11:30:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUcUj028443 for ; Wed, 24 Jun 2020 07:30:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 859997F49D; Wed, 24 Jun 2020 11:30:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C4A05BAEF; Wed, 24 Jun 2020 11:30:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4C45431E58; Wed, 24 Jun 2020 13:30:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998262; 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=kIQJ9CeCtEXcjwf/+kopOsW4htznwXBp1TsGYYUobMk=; b=dI/3BWspNHCxf8l+kVz025gQH7xUq9RXKtTrXo2FtGFcvTPRI9KP5pYCCuB7mpzQePw/sM ZdgmpnZmepYEg6n4wH7FTTlsFw2SQiIMLaleNyVgDqTvRKTTyshJ8UV73tCehOdzaXLkmW YW6ENRTJ5E/X5kG99Mm6WR5Pn1teuUA= X-MC-Unique: 3tawXdDRMMa7cskPN1Su2A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 16/20] audio: create pcspk device early Date: Wed, 24 Jun 2020 13:30:22 +0200 Message-Id: <20200624113026.13343-17-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.13 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" Create the pcspk device early, so it exists at machine type initialization time. Signed-off-by: Gerd Hoffmann --- include/hw/i386/pc.h | 1 + hw/i386/pc.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 283754f42bd5..3290b0b93097 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -33,6 +33,7 @@ struct PCMachineState { PCIBus *bus; I2CBus *smbus; PFlashCFI01 *flash[2]; + ISADevice *pcspk; =20 /* Configuration options: */ uint64_t max_ram_below_4g; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3f1d42b05102..f7ca8d981afa 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1240,7 +1240,7 @@ void pc_basic_device_init(struct PCMachineState *pcms, /* connect PIT to output control line of the HPET */ qdev_connect_gpio_out(hpet, 0, qdev_get_gpio_in(DEVICE(pit), 0= )); } - pcspk_init(isa_new(TYPE_PC_SPEAKER), isa_bus, pit); + pcspk_init(pcms->pcspk, isa_bus, pit); } =20 i8257_dma_init(isa_bus, 0); @@ -1912,6 +1912,7 @@ static void pc_machine_initfn(Object *obj) pcms->pit_enabled =3D true; =20 pc_system_flash_create(pcms); + pcms->pcspk =3D isa_new(TYPE_PC_SPEAKER); } =20 static void pc_machine_reset(MachineState *machine) --=20 2.18.4 From nobody Fri Mar 29 08:50:11 2024 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=1592998395; cv=none; d=zohomail.com; s=zohoarc; b=gO7Uha/hYw7ZAjcFfAXycT+ObXBlHJ5+bgWGNe8KR+VuzCMePjb7Wqkvgmo62/QEcDI2Lnh7UFvkzMtK76W7TuXKzwSndjkvOWE/Zhb8AelNOTuao8gufPGpzQn9xtiGqOc5VFMu9hZR+i2xHkDx0lXbgY7myNBjq2cLlaIc+1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998395; 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=UXFSsQuaVtXhn+4w6xUfiV8YMH0MsMlHnZf2WuTzOAw=; b=brnNPJMdmh+z93hqrKaGcli7U3LCVCcgXUvUpjSmJ9WfdHXMHT/HHtyFi5CD3h5VQW7oUMOk5tWt3qdXrCpsU5NrxjSV7a9Bk4iL8HpNiAY2IZnMRp6ETxf2vkd8i4LYrH4RqGLNFYceuG3UpAgjjON0L4oHg5PTlE62UEXVJrI= 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 15929983956401017.588102404552; Wed, 24 Jun 2020 04:33:15 -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-462-oJ68LRPSOW6JbCSh_QRY8Q-1; Wed, 24 Jun 2020 07:31:06 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 484F718A8222; Wed, 24 Jun 2020 11:30:59 +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 E87587FE90; Wed, 24 Jun 2020 11:30:54 +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 B996D1805313; Wed, 24 Jun 2020 11:30:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUcLm028433 for ; Wed, 24 Jun 2020 07:30:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3572D79303; Wed, 24 Jun 2020 11:30:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id D51A9512FE; Wed, 24 Jun 2020 11:30:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 56E7B31E59; Wed, 24 Jun 2020 13:30:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998394; 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=UXFSsQuaVtXhn+4w6xUfiV8YMH0MsMlHnZf2WuTzOAw=; b=RUrGU57A/V4DeRbUb3RzzcR7H2b3XiPlDILtp8LDxyUYZHs7ceVefjoPNaLYNpKn6If9ke GWofOqsy5uR2dY/CAqW9GAdITvE2ZforQwkZTjqZvAgIZkCeMBPnb4qlrot48ehlLg/teM rmTG+Adjve/lSl3jqHVe+3vchSNQ2C0= X-MC-Unique: oJ68LRPSOW6JbCSh_QRY8Q-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 17/20] audio: deprecate -soundhw pcspk Date: Wed, 24 Jun 2020 13:30:23 +0200 Message-Id: <20200624113026.13343-18-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.15 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 the audiodev property is enough to properly initialize pcspk. Add a property alias to the machine type to set the audio device, so pcspk can be initialized using: "-machine pcspk-audiodev=3D" Using "-global isa-pcspk.audiodev=3D" works too but is not recommended. Signed-off-by: Gerd Hoffmann --- hw/audio/pcspk.c | 24 +++++++++++++++++++++--- hw/i386/pc.c | 2 ++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index c37a3878612e..4c7e339ac2b5 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 '-machine 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) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index f7ca8d981afa..bd393f82377f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1913,6 +1913,8 @@ static void pc_machine_initfn(Object *obj) =20 pc_system_flash_create(pcms); pcms->pcspk =3D isa_new(TYPE_PC_SPEAKER); + object_property_add_alias(OBJECT(pcms), "pcspk-audiodev", + OBJECT(pcms->pcspk), "audiodev"); } =20 static void pc_machine_reset(MachineState *machine) --=20 2.18.4 From nobody Fri Mar 29 08:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1592998324; cv=none; d=zohomail.com; s=zohoarc; b=Wbt1Pl2P9IwQdymtSQSk4wZnxI89xs4Knkdf0Ye2Ys+GPnr0M2g4bBfcga3ofdbepXlXAssAU6SFSjAOVStuqyZmLHgnn/FoqF9hoSTiC8MC/cYrrFBI6C+uZkJYbigBg8QmsTheKrNgx2I8HCWffz7D5pNqM0M5fHf1H7h/QCM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998324; 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=eM5iqr2FFJ/KmKCoaf2j9QYBByiH0+UI7k7ir+RfAMc=; b=OSOLUT1qwT64JN80nUdgAnmQpNmG5J873A/8m4xW1VGLGsOQMsRtN7+FoRNsYu5kLn0edYsQl74bPxTgjYy918ay0MvHHW77AvgbQxcXQGqadAJ7eJfc5d7E4pgYRLGGW9CASJsag7oatwiXbQYnoUyFZYzYuaUULP3DMnMHT3k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1592998324857648.5879014908911; Wed, 24 Jun 2020 04:32:04 -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-402-l_G9KLWJPQOj2DUi9YGsJQ-1; Wed, 24 Jun 2020 07:31:02 -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 19E61805EF8; Wed, 24 Jun 2020 11:30:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E626A7CADB; Wed, 24 Jun 2020 11:30:55 +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 9D05C876A5; Wed, 24 Jun 2020 11:30:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUcdK028446 for ; Wed, 24 Jun 2020 07:30:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8F84F7CADB; Wed, 24 Jun 2020 11:30:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40F581C8; Wed, 24 Jun 2020 11:30:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 5FEC631E60; Wed, 24 Jun 2020 13:30:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998323; 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=eM5iqr2FFJ/KmKCoaf2j9QYBByiH0+UI7k7ir+RfAMc=; b=YoWlH3r0PU+hqEVsOqYuHNKVIpgXeRS7bjqKMW+ktnAqz4Qwaj50hqwEtlrHM9vEbDDT3o qec6q0hE2x8eYWzTwb+nWDQqqaWa+ZhqZi2GX4yIE8i8fNNVDKxaHbsQjbsaVX9BCRBZtB tcXZgAhOUx9rliWLRkyGMEE2ivMhY78= X-MC-Unique: l_G9KLWJPQOj2DUi9YGsJQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 18/20] audio: add soundhw deprecation notice Date: Wed, 24 Jun 2020 13:30:24 +0200 Message-Id: <20200624113026.13343-19-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.13 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" Signed-off-by: Gerd Hoffmann --- docs/system/deprecated.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 3a255591c341..4cbf3bba3944 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -82,6 +82,15 @@ should specify an ``audiodev=3D`` property. Additionall= y, when using vnc, you should specify an ``audiodev=3D`` propery if you plan to transmit audio through the VNC protocol. =20 +Creating sound card devices using ``-soundhw`` (since 5.1) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Sound card devices should be created using ``-device`` instead. The +names are the same for most devices. The exceptions are ``hda`` which +needs two devices (``-device intel-hda --device hda-duplex``) and +``pcspk`` which can be activated using ``-machine +pcspk-audiodev=3D``. + ``-mon ...,control=3Dreadline,pretty=3Don|off`` (since 4.1) ''''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 --=20 2.18.4 From nobody Fri Mar 29 08:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1592998260; cv=none; d=zohomail.com; s=zohoarc; b=PwqDOUcEW7c7fnDKDmJcT+XQQNUMMKLT6g3LkseSgNeaLTmR1HJesGD/1tAp6z5/YBRRpbclWfbn2EVD3QhwljQhL3pCwcdM+6PymBsWsV8wdRas25dhOkKEWraiIVsYJ4yjxovY6vDbu2QGTbMvbO2v6YCLHREu6E7Zjn5e4HY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998260; 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=e90sVaiY0y2bJO1wUVMH2JGLJEwOGOs++Ldelaxq98E=; b=F9kIbssgCgYa4oSot73SZKDuwUJ0t8FVQUwH3XYNznH9uvZYXurxsCF8xTLCjqJEBfWuMouaA2Es03CwJTWDWvg8ZAMCYjeKqbfcgecwkUwffBgliuz9nZ2Fqmznu9WAyiopzubaNkvJeSLhvdqOfZp/rmkS0xCJ7K2j599Y1ko= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 159299826019261.606368855508435; Wed, 24 Jun 2020 04:31:00 -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-210-z-NuztLXMEiu4qYOrtytWA-1; Wed, 24 Jun 2020 07:30:56 -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 73AE21005512; Wed, 24 Jun 2020 11:30:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4FD8D10027AA; Wed, 24 Jun 2020 11:30:51 +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 22CBD104918; Wed, 24 Jun 2020 11:30:51 +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 05OBUc3l028438 for ; Wed, 24 Jun 2020 07:30:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7A59E5C296; Wed, 24 Jun 2020 11:30:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35ED55C660; Wed, 24 Jun 2020 11:30:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 68C7A31E61; Wed, 24 Jun 2020 13:30:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998259; 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=e90sVaiY0y2bJO1wUVMH2JGLJEwOGOs++Ldelaxq98E=; b=RhpAZVXX5+vN09/eZ/IQjnUiUI5XPnU0KwcGYsc4e9muKqeaO+9pqJZnc42FTl0cglQjJN ogzL9Wo4y9A7O9XSmaENIWoYX18IQNvpLMZ8iqXR5d0TcMrWFYCdJ839MHhM/qzirgKMpt mEJ35GeO9Skuo8q1ZitGQpSFdPZ3nE8= X-MC-Unique: z-NuztLXMEiu4qYOrtytWA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 19/20] pcspk: update docs/system/target-i386-desc.rst.inc Date: Wed, 24 Jun 2020 13:30:25 +0200 Message-Id: <20200624113026.13343-20-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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.84 on 10.5.11.22 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 PC speaker with config hints. Signed-off-by: Gerd Hoffmann --- docs/system/target-i386-desc.rst.inc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/system/target-i386-desc.rst.inc b/docs/system/target-i386= -desc.rst.inc index 47a169e0ae2a..7d1fffacbea3 100644 --- a/docs/system/target-i386-desc.rst.inc +++ b/docs/system/target-i386-desc.rst.inc @@ -31,6 +31,8 @@ The QEMU PC System emulator simulates the following perip= herals: =20 - CS4231A compatible sound card =20 +- PC speaker + - PCI UHCI, OHCI, EHCI or XHCI USB controller and a virtual USB-1.1 hub. =20 @@ -49,7 +51,7 @@ must be told to not have parallel ports to have working G= US. =20 .. parsed-literal:: =20 - |qemu_system_x86| dos.img -soundhw gus -parallel none + |qemu_system_x86| dos.img -device gus -parallel none =20 Alternatively: =20 @@ -60,3 +62,12 @@ Alternatively: Or some other unclaimed IRQ. =20 CS4231A is the chip used in Windows Sound System and GUSMAX products + +The PC speaker audio device can be configured using the pcspk-audiodev +machine property, i.e. + +.. parsed-literal:: + + |qemu_system_x86| some.img \ + -audiodev ,id=3D \ + -machine pcspk-audiodev=3D --=20 2.18.4 From nobody Fri Mar 29 08:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1592998326; cv=none; d=zohomail.com; s=zohoarc; b=fe2zZNat/KGkkzpj/znhlW2WK+Fc3G8BQZgGQBC2ZYwV/g0xAl+vsEnfrv6nwctG9cTNW5r8DSnpODVxW4BJveQ8LOX8Q5t732/WMMDMLVbPqDaXlj2TSQ1/UPz5OKUIjVPDf/uYT/OZH0tXnVD3WyLKzR4t7fOYdd3X2wCRJyc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592998326; 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=pyfsMHzLAMpLmC2/2ZneFx8EwfYzlS6RTEujwUnogmQ=; b=RePMDvbYm6OonvHijDcjLEKen+/akWDeSImx+PEL3yQY/Y4DpMtM6PPQsadH1nDGJf7ziVbYaeVZ/EsM1A9vIEmEW9xdD+5xLRS6wL0Dx/aua5uQo+BAeojgfBYja3o/YQY+tpSMlUK6we6Kkz0uGTdUxwzvYOW5bomOs+NWCgE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1592998326632543.9577906376896; Wed, 24 Jun 2020 04:32:06 -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-471-QFKp5Uk_P6KNLqsR5AV4jw-1; Wed, 24 Jun 2020 07:31:08 -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 CC974A0BF0; Wed, 24 Jun 2020 11:31:00 +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 AEFC45C6DE; Wed, 24 Jun 2020 11:31:00 +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 7FB4A1809561; Wed, 24 Jun 2020 11:31:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05OBUcCh028453 for ; Wed, 24 Jun 2020 07:30:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id D82461ED; Wed, 24 Jun 2020 11:30:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91A6061981; Wed, 24 Jun 2020 11:30:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7345131E62; Wed, 24 Jun 2020 13:30:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592998325; 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=pyfsMHzLAMpLmC2/2ZneFx8EwfYzlS6RTEujwUnogmQ=; b=VqWuEUbRBcVGJv9X3ACFKf+UG9oB+B4h5OmjIx+y9QNihcXMIu4lbd6cytIzcNDwRINuiP ZPkoUaqhcM9F0cAyVesWPqfrwpRn+pWyW1uBssAYZy3gNKVXDGcd8NFxXLLHWwYabjXiEJ dK/yZ+KmQ+ytN6ASRSIU/JkThUSZfOs= X-MC-Unique: QFKp5Uk_P6KNLqsR5AV4jw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 20/20] audio: set default value for pcspk.iobase property Date: Wed, 24 Jun 2020 13:30:26 +0200 Message-Id: <20200624113026.13343-21-kraxel@redhat.com> In-Reply-To: <20200624113026.13343-1-kraxel@redhat.com> References: <20200624113026.13343-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: qemu-ppc@nongnu.org, Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson 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" Allows to drop the explicit qdev_prop_set_uint32 call in pcspk_init. Signed-off-by: Gerd Hoffmann --- include/hw/audio/pcspk.h | 6 +----- hw/audio/pcspk.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h index 8b485602675f..06cba00b8376 100644 --- a/include/hw/audio/pcspk.h +++ b/include/hw/audio/pcspk.h @@ -33,11 +33,7 @@ =20 static inline void pcspk_init(ISADevice *isadev, ISABus *bus, ISADevice *p= it) { - DeviceState *dev; - - dev =3D DEVICE(isadev); - qdev_prop_set_uint32(dev, "iobase", 0x61); - object_property_set_link(OBJECT(dev), OBJECT(pit), "pit", NULL); + object_property_set_link(OBJECT(isadev), OBJECT(pit), "pit", NULL); isa_realize_and_unref(isadev, bus, &error_fatal); } =20 diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 4c7e339ac2b5..ea539e7605a8 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -219,7 +219,7 @@ static const VMStateDescription vmstate_spk =3D { =20 static Property pcspk_properties[] =3D { DEFINE_AUDIO_PROPERTIES(PCSpkState, card), - DEFINE_PROP_UINT32("iobase", PCSpkState, iobase, -1), + DEFINE_PROP_UINT32("iobase", PCSpkState, iobase, 0x61), DEFINE_PROP_BOOL("migrate", PCSpkState, migrate, true), DEFINE_PROP_END_OF_LIST(), }; --=20 2.18.4