From nobody Mon May 6 12:04:52 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=1592825377; cv=none; d=zohomail.com; s=zohoarc; b=PA/TKoCNEdc3WSTTq20jcT4pQMKgO8j3HUJvdzB2DtcsK1jDLH29BkBhyvqfC84+qI3s57MibAUWl+9N/X/5tG3wm7zLGOrtN6SNV7jrZEEzZOOdJju77irRwN3U6k5uyIfESR2BtpgGMqq5ts+9uUqRF+Yobc16eG7YESvaUng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825377; 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=GXOUzKSjyW3er1OMlFLzyOdWb3ro3QBSR6sQd/DiOkPgyBA/a4l6fCr3qhkoX3DX1cT2kEXvmnl5OxdrVP4Jrq6VVWI5mb6WZMwpqIXgRuJo90rEZG8CCFM/DfTTCyoYVapkFq/7iUrkslgeihkRKaNjteEFMvIgXeV1BOds04Q= 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 1592825377010103.77000445674389; Mon, 22 Jun 2020 04:29:37 -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-157-vECBvxD-MEOsaf7R-tdBEQ-1; Mon, 22 Jun 2020 07:29:32 -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 5305D8005AD; Mon, 22 Jun 2020 11:29:27 +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 BB57510013D7; Mon, 22 Jun 2020 11:29:26 +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 E65E4833A4; Mon, 22 Jun 2020 11:29:24 +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 05MBTOPE019492 for ; Mon, 22 Jun 2020 07:29:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6319E7166B; Mon, 22 Jun 2020 11:29:24 +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 43C157166A; Mon, 22 Jun 2020 11:29:16 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1552E1750C; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825375; 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=L1O2fTihij+Ce8eFhfP0EfPP8b77tJG8YPioTcH/rND6c4pgu/LgnCTc9d/FyoBYIihjKd 29VNwaIRPxsCj2AoKrYRCLawHpZMg7nLl7//lvE0obDkUr+EClQ8BH/FUYKZSkpyV0JqH8 WmMNu7FIs2sYDHJd89oYRec9knZ+PM4= X-MC-Unique: vECBvxD-MEOsaf7R-tdBEQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 01/19] stubs: add isa_create_simple Date: Mon, 22 Jun 2020 13:28:56 +0200 Message-Id: <20200622112914.30454-2-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-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: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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 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 Mon May 6 12:04:52 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=1592825385; cv=none; d=zohomail.com; s=zohoarc; b=YXgpZX1zjQ79coSaJTTtlfO6r0ErovqvP+wgAOgmEgOjszRnrNwwfeI7ti11OjMf6Ik6XWRV87xuv+pIdyH+AwvyDTv81tNhGuWBcoHuoqhb7MjTEI+yLEtPNYQ9loQ3oqWAkNIwg3f9peemIH35xqNHDlcUXDAqlfXjBcFpGc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825385; 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=dLNIsF1PKaRDqxfENsCEagUn0fM+8rbLwbLYLcj0Ia55otQGMWFgCCjDMu/X0jQVnLRRQ851UObwOJeTVxwnEpZZuhuBAml2I9fp5kBeKVjpgXeKhcENtvFs6MRRYV9wTxoVj4S6VMH/i2sxmWEIYQTQ+ywFzL6hGUJzHMqPQNI= 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 1592825385823723.4400679261664; Mon, 22 Jun 2020 04:29:45 -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-325-YXCNLMRQN7Ce4xV9rgxwcg-1; Mon, 22 Jun 2020 07:29:42 -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 C02C319200D3; Mon, 22 Jun 2020 11:29:36 +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 A05A95BAE7; Mon, 22 Jun 2020 11:29:36 +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 6F5BC1809563; Mon, 22 Jun 2020 11:29:36 +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 05MBTQIG019514 for ; Mon, 22 Jun 2020 07:29:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0889A26DFB; Mon, 22 Jun 2020 11:29:26 +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 4F06326DFE; Mon, 22 Jun 2020 11:29:16 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1F8BF1753C; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825384; 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=HxMWVQ1mwLxYrZ/UvCaKYh+1WIoNT3EaTaRhCuXNLjL/KtN8jIXlOK6McbFayDyPaGWr6m l2re5ctwG9ehY0/qEcC1cqwEremrnPmgNCW/CmtVAJqafkH5vxl0ufyzRK7sG09/k+dG5B azMeuT6zMxjTgIHuOV4ZhjRnvZ4z9ik= X-MC-Unique: YXCNLMRQN7Ce4xV9rgxwcg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 02/19] stubs: add pci_create_simple Date: Mon, 22 Jun 2020 13:28:57 +0200 Message-Id: <20200622112914.30454-3-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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 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 Mon May 6 12:04:52 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=1592825383; cv=none; d=zohomail.com; s=zohoarc; b=fVYtfiKe4kfEpPu0qzojjH2zy3C2wa/tdePywC6nGLKnwtP/RUhZNrYu24rwz1k+klig5wt163pPFFEPAFaual2Fodk/fncVBJAwWNFCzu8prOaJCogZSPFT4OV2EbvxrSpA9VTYujf5dVrxdLgvzukS2bJxsaLPbn+JLmOyD+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825383; 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=P7+mIunvkW3oTBke03JfmZE/LaCykJjsYFReRdtYe8K2jK4lZNb0r11v0s0zfKEWxLmkj0XEfszzVt5GillGIvNCMsF6ODju90hiUmWJ3UJnXaZf8EgT5Q3ZKEV6c25DcShOJhprOTL9Drr4btY7R1I0+R3U51b7d5i6EPPXMJo= 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 1592825383883814.7433766666117; Mon, 22 Jun 2020 04:29:43 -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-163-J7McE76AN36poGxREUhhbg-1; Mon, 22 Jun 2020 07:29:40 -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 A8702EC1A6; Mon, 22 Jun 2020 11:29:35 +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 3BCC75BAE7; Mon, 22 Jun 2020 11:29:34 +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 0C7011809561; Mon, 22 Jun 2020 11:29:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05MBTQRg019519 for ; Mon, 22 Jun 2020 07:29:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1B9745D9F3; Mon, 22 Jun 2020 11:29:26 +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 333C15D9DD; Mon, 22 Jun 2020 11:29:16 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 29BC31753D; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825382; 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=f7ijQ5OpipCeshX+v/EnQaIFBQfvdmQNYk1jbDPHV8AJzURfNaiQ9N9ZZ/tjUx+nVxAHKJ 7ypw8jwxYmpCT6n9JWDZDYho9zyiflZAOKvM0oaeSrIHUyyxhLBFZV8PRB4qzlgqEEILVp vh10Ozf7JO7e5/WtZwsQpZ/5rEGtyHo= X-MC-Unique: J7McE76AN36poGxREUhhbg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 03/19] audio: add deprecated_register_soundhw Date: Mon, 22 Jun 2020 13:28:58 +0200 Message-Id: <20200622112914.30454-4-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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 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 Mon May 6 12:04:52 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=1592825377; cv=none; d=zohomail.com; s=zohoarc; b=P+NYPwzfYItzXPa0T9gbFhDPfvN8Cwl4714edumxdyZotzghrQga5yPkg58AYDnzq1g8MmhfN2ktNQL8axjRE0a7mfAe4/ZvoxBwRJJ+GU80Xe7gpJxXhfCmUpNta31RTO2+/x2uVkGcnjj0D887043w/0r5GYEju6MhWBxiMss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825377; 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=HtIjXHVlKjZ4JMU2LOOM9zdGEG76CCsdB/C4jsxe8QgwlLfvT8r2nM6oFF4bEBOUezRbRucZ/IEtK6n1vOjRNl41WYkrD/vcyvZ+EjGZuOPbrdFYCQ1Wl/VynKEORN5HNd2BZyoVgILhikUkLHR9sd0BrVTzLOINLmYfNFlsb7k= 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 1592825377046677.0788246302036; Mon, 22 Jun 2020 04:29:37 -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-208-hRT7vJOEMSyXaBG684BkXQ-1; Mon, 22 Jun 2020 07:29:33 -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 793B4805724; Mon, 22 Jun 2020 11:29:28 +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 5C1287166B; Mon, 22 Jun 2020 11:29:28 +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 2C94B1809547; Mon, 22 Jun 2020 11:29:28 +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 05MBTOr9019498 for ; Mon, 22 Jun 2020 07:29:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id B55745C220; Mon, 22 Jun 2020 11:29:24 +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 48A965C1BD; Mon, 22 Jun 2020 11:29:16 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 344079D8F; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825375; 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=RNjDc8uTpiaJ65N87b7HN/3NwUxAdzQwf42bZOKC8Cz8R4i2MQ2P2phErMW7U3pI4ydjYr s1JnOpoJHlz0MgrEhP7OrXHazo4Ojpqo9lEDMmMo1KzRijWIGx63IJyaKvnc3oFKgygmfm PGIQ9wj6ToultLfHmjJhDSZ8rsxBq+w= X-MC-Unique: hRT7vJOEMSyXaBG684BkXQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 04/19] audio: deprecate -soundhw ac97 Date: Mon, 22 Jun 2020 13:28:59 +0200 Message-Id: <20200622112914.30454-5-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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" 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 Mon May 6 12:04:52 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=1592825415; cv=none; d=zohomail.com; s=zohoarc; b=cG1Kt+VBdcDGPb/9I6MUkSFYXDZTQnJmEZxd2UMCeS8Ry+7C/mMDbZa+z+6cU5qmbquDhmyIjrXZBVeq5brdms5+2oJVk+/SmF7v64TV8p2ZAtnnz7He1X+JZodadP6rUH0uVwT3jKayOoKXUAh59c4ryLj1t319WShRwC+bm4o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825415; 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=TnhNBhe0KtpkLJb4trIhpmZo9T6ECnapvlyjw3N4x8cBEzo2CkJ27HYfc/WALxaiUYMuRcNBZxiv+K+my1ceABZEKNnugssFg7FSTkj7EP+9z2NXyZcEVRJV64IT9YtS1ywTwUw3nPvZ11/PgUx35vfcrJ485pCRNpyDEx3bcdE= 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 1592825415416707.8404972761531; Mon, 22 Jun 2020 04:30: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-321-UJIhRIBtPUCWJ3hd47KZQg-1; Mon, 22 Jun 2020 07:29:53 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 538DC19200CB; Mon, 22 Jun 2020 11:29:48 +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 306E127CD0; Mon, 22 Jun 2020 11:29: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 F356E104903; Mon, 22 Jun 2020 11:29:47 +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 05MBTYfu019636 for ; Mon, 22 Jun 2020 07:29:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id EE4067C209; Mon, 22 Jun 2020 11:29:34 +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 B4BD47C1E3; Mon, 22 Jun 2020 11:29:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3EC149D92; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825414; 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=Gqvw6zlspNy/9h6nYUe1K6ObE7XzE41iM3z+rDlzJ+0xMedwglqz82soW3pCrf3n5W0IXZ MjwiLoMenHR4gXKprP5QNyq2rNpfvH/uecsQUt2aJGqWREvb7ZX5iJK4kfIc7IMDD5Y5M8 IKXo8CP6EfMCXtlw6lCMT+swskOK0mE= X-MC-Unique: UJIhRIBtPUCWJ3hd47KZQg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 05/19] audio: deprecate -soundhw es1370 Date: Mon, 22 Jun 2020 13:29:00 +0200 Message-Id: <20200622112914.30454-6-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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.23 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 Mon May 6 12:04:52 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=1592825396; cv=none; d=zohomail.com; s=zohoarc; b=HUWxI95HCN81Fi739tgJ/JdRFonJv1NQhL3WZJjtuqdiO571X4usVNY9mXSdEHSrG5YAFfOgMfQaE70GneyGkcD9fwB4stED7sJ0goRSEVY5ZyOHTFXk/itzVxKX05k5y7zer3egAY44RNe4f9/OykHP2RPYusD7TyEPCjtNpKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825396; 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=eSCdsjvyH4p3T8Uf22IjkM3tXzP2cLSkjbBrjKQjZMd/7l4ZRUru9g9G9/FuYgvAG6y2LT5tVy9qWjN3ZGrJhFxE8yirUaouRD3/cQwjx0uxyPi9WIg+RSUg6sU1pvlDZSPeCbE58bx5xFYf2hAca1bOpD/TAy7ItIemwmxiqaw= 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 1592825396706222.33400741769788; Mon, 22 Jun 2020 04:29:56 -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-441-PpQ21o67NuKK-C75gDSTrQ-1; Mon, 22 Jun 2020 07:29:52 -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 0A17B805730; Mon, 22 Jun 2020 11:29:46 +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 DFB847166D; Mon, 22 Jun 2020 11:29:45 +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 B27B797019; Mon, 22 Jun 2020 11:29:45 +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 05MBTYEn019626 for ; Mon, 22 Jun 2020 07:29:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 799461002393; Mon, 22 Jun 2020 11:29:34 +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 AD4FB10013D2; Mon, 22 Jun 2020 11:29:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 477469D94; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825394; 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=T6Re/2ZTr59S9+I7l3o57TLakIbPdd/IaA6nthSzKPR+Kkg99gpAnArz6jcOOAtkzDYLLm iZrtRdDTaiaAMBTbn6DJnPVX2OoRxsr0O1sJZIkOG5wd3YK5NbpMXqucL+v9+NnvWtwreY ifNdbMSm74Fw474PW9FYdks/bXqU1TQ= X-MC-Unique: PpQ21o67NuKK-C75gDSTrQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 06/19] audio: deprecate -soundhw adlib Date: Mon, 22 Jun 2020 13:29:01 +0200 Message-Id: <20200622112914.30454-7-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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" 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 Mon May 6 12:04:52 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=1592825396; cv=none; d=zohomail.com; s=zohoarc; b=XTMs7nUikHrPz8atxYIgUs/Mted/XaItWuks2fMFN9DwR1/vA48tOhacsqxOzCHvHuhMv2qCUx2mamYKtBOzMt6q7zvwBVRhUK92ZAGbXVldW1HS8a6SQiguGFTEcqQRSAO252TDDiWB0mFpQfn8yIfw83oqyQtwsYCQZ7o7f0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825396; 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=ZZVYKCv7XleQuo5sR1TbzkS/tdUaiiuOPH22UpZGzMckW+/9M8LwBKFLQ+0iJbab+6q7Jol6y9vLu9GqAyHIKiuS5a0bn59YsHt/70GZsio+1sTRpbrsjPpXu/23qfuIiAMCVZVwyq7OR/muMCvnMYcOYmSTfaKRgcGk9hin0FU= 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 1592825396955720.4938753371218; Mon, 22 Jun 2020 04:29:56 -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-180-OIT3ZpuGP0O1260JgJDagQ-1; Mon, 22 Jun 2020 07:29:52 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1034919200CD; Mon, 22 Jun 2020 11:29:46 +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 E661427CCA; Mon, 22 Jun 2020 11:29:45 +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 B82A4B349D; Mon, 22 Jun 2020 11:29:45 +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 05MBTZst019646 for ; Mon, 22 Jun 2020 07:29:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 131527C1FD; Mon, 22 Jun 2020 11:29:35 +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 CC45A7C1FC; Mon, 22 Jun 2020 11:29:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 502B89D95; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825394; 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=EqYk+j20Q1uZ2zNgF+piZJP0jJsr8so45rNFpivBYEHEHWngBcAs0ij48RMuHZUECTG9mH Jxgjfqi8DxwNCeUZE9/uZ6leuNon0FloCWOj7mitPJnhIISVTcpoIxoYnCQPf8xltm7+Tl wxSZJTVEjvZHE2li+LzGgT7ORrVwLDY= X-MC-Unique: OIT3ZpuGP0O1260JgJDagQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 07/19] audio: deprecate -soundhw cs4231a Date: Mon, 22 Jun 2020 13:29:02 +0200 Message-Id: <20200622112914.30454-8-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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.23 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 Mon May 6 12:04:52 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=1592825410; cv=none; d=zohomail.com; s=zohoarc; b=DIjnWNc2MaDu4vCLvc9I/zqofiGBRZ/rW2rqP9xppLk3w2TFBde0nvoRZt4zfZu3Kj5InVcVxBtKFC1sO0X3T6q1c9DKtr5DbZuM675lrtsGy1FS+MoKSqXVm9ZT/RJ8IuS4ASQiYI+ypcY7KMmwiZHQD+zzXsemk7EcW4I2RaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825410; 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=Pco8jgw37U0wPGbycYvQ7xh4vXJSwo2P8wTkmwTArD12OBwkY44s4RE6PWDSCXKPgD1doUE/IwTNmj990Szh6X8VuYJADEaKhiA3ISbTc9pwPgO5XnQfSPk74YOE5dqO1yRYnjPG444DYOon3OKC7MeAcBwsblwTLL72OcMKDoE= 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 1592825410382791.6902576510174; Mon, 22 Jun 2020 04:30: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-34-oDAFh7T4PjuKeoBDtlVvqQ-1; Mon, 22 Jun 2020 07:29:55 -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 9677A19200C9; Mon, 22 Jun 2020 11:29: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 78F695C241; Mon, 22 Jun 2020 11:29: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 4A66F1805310; Mon, 22 Jun 2020 11:29:50 +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 05MBTZ3P019639 for ; Mon, 22 Jun 2020 07:29:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 040327C209; Mon, 22 Jun 2020 11:29:35 +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 D43997C1FD; Mon, 22 Jun 2020 11:29:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 58F5B9D98; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825408; 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=Rw8tWzeTZ3YZIj5JJW74sEyStweB1sgy2xXKEjtoNLhGIgTATnFb9itrfUjGx6L9Xge+Mz 8DEgarrw++Up3jUCWPtW4RfKsUPoRdQ4wPAypL2csxFgmAXSXJnuMDYnDX+TR4FU1KubOR XWWdTi+DeEUWObyBxy/VI+Osud3sl3Q= X-MC-Unique: oDAFh7T4PjuKeoBDtlVvqQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 08/19] audio: deprecate -soundhw gus Date: Mon, 22 Jun 2020 13:29:03 +0200 Message-Id: <20200622112914.30454-9-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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 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/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 Mon May 6 12:04:52 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=1592825470; cv=none; d=zohomail.com; s=zohoarc; b=Q1jf7HsGnB+by3tPFLnZgVlq4yjWY/1kJ4B+n6SwWXiUlBOlLCYe4XfGpeBbeCQpH9NftHO+N8cmDSUKG6TuLI0Nsnb/+qNFIL5JI9kcF3VpsrWcX3Ev9HQgxBbSgjxSmdEYsBlHuBqCtxJVEGQ55TzYNNSH1psM/5SeftYzmjo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825470; 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=OSSJWnd0+/wv10c6nHqfebJ+A7wCszYEC0VzdPD2xX3H/pvzKmBGE9Y1y6ElULjy3NmQpMOB7gagdP2VicK8KtkGdMLfNt8kF6WzPmAaWbNBr4rkzzeLPmev84utvIJwoKDYw9pnnRvFclbes6FSBvjWHBD+7wO/cyy+T1Yx6Bo= 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 159282547005335.77628627936667; Mon, 22 Jun 2020 04:31: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-320-Z13jluUEOWGRKAKH-jwuKg-1; Mon, 22 Jun 2020 07:29:58 -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 D8785107ACF8; Mon, 22 Jun 2020 11:29: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 B9CA17C20F; Mon, 22 Jun 2020 11:29: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 8A0961805315; Mon, 22 Jun 2020 11:29: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 05MBTZHD019654 for ; Mon, 22 Jun 2020 07:29:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 68C0F5BAE8; Mon, 22 Jun 2020 11:29:35 +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 239B77E57A; Mon, 22 Jun 2020 11:29:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 61B7E9D99; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825468; 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=bGYfec3lE04AZGEaPR042DpDc35zXcIdFGrPJm4YFNNXHkT6xolNH3ZTeqmC59PxGqs+kb DfOhJqwLeiR2dqT0OSq6LWyx1EhQIwOD+LooU6fwTnCCBpqFIfPynKfTr/tgWkH7nBix8W lEPCSIriJdFnn2mbUqZFi0jmDJUl3R8= X-MC-Unique: Z13jluUEOWGRKAKH-jwuKg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 09/19] audio: deprecate -soundhw sb16 Date: Mon, 22 Jun 2020 13:29:04 +0200 Message-Id: <20200622112914.30454-10-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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" 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 Mon May 6 12:04:52 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=1592825376; cv=none; d=zohomail.com; s=zohoarc; b=Eh2ztHDvjEO9LDFtUxFLBvGnVf3Hu/wIFahmblDQLcMXbft+xECXRxXhDjRTDI06RHL7l2PfGoys5IaDtAdS2WdDkdRUTNT151tt4/H7wXtPfWj/VcHYTfrqiHPiYAFuhsxui+sxGxIEVOQwDCKQrDHsi+upGGi92IsKngXNff8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825376; 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=G6dZnAAY+q2FMjEl2Ybp+UfKBhrSiS0g/m7PVItXX/WJwyEps6/+5B0rvUJPrBpK8o7NQPtQi4uBi0Hn+aWXTodiDULFHxreMHx7STUWMKminB/1wszH5GaJS7LSSYDxXOdKW2LuhX81+6jffsluwu03YkRoY06tO/LRou/4t8U= 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 1592825376980293.402437443301; Mon, 22 Jun 2020 04:29:36 -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-443-kG3A5IB4O_aw4MobNyP-ow-1; Mon, 22 Jun 2020 07:29:33 -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 1FE99100CCC2; Mon, 22 Jun 2020 11:29:28 +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 F33EE5EE0E; Mon, 22 Jun 2020 11:29:27 +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 AEEF8833CB; Mon, 22 Jun 2020 11:29:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05MBTQP4019525 for ; Mon, 22 Jun 2020 07:29:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 889A55D9DD; Mon, 22 Jun 2020 11:29:26 +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 283BD5D9D5; Mon, 22 Jun 2020 11:29:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6A6409D9B; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825375; 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=DOYmTBKp7tYUX6xvziyIx+F8pNGKddXrUgifsLQmUgmU7xMIVoRm8Kt/+SUBI8NE2oLuTm pGFC7+MljifRUEsTkDgtOncDqDpRbUR3pvLE9IfDNUfgKHFcLtIT1j/4XpgodTi6Qp0hvw 4j1dVDzzJI+cbg4SCXqrnpbcCTGSFYE= X-MC-Unique: kG3A5IB4O_aw4MobNyP-ow-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 10/19] audio: deprecate -soundhw hda Date: Mon, 22 Jun 2020 13:29:05 +0200 Message-Id: <20200622112914.30454-11-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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 Mon May 6 12:04:52 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=1592825387; cv=none; d=zohomail.com; s=zohoarc; b=Nb2cClURgLjvoXPmrDuigyL3/wJuxOJgnhP00CMxLbrIR5fZkoPpCXe6Gqwi/HHAcxddTJ8l/kriQ3p3mC3usV05HV53N/kKZ8bQUnSMmTkDsYZiWAbc6hwByOq6x/xwW27skNBa798QKxoAYLmtoyrfQGWSoAqdF2VFXKd7gyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825387; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ZuarwHpOQc0u30LFTFQMPNO3U8EShjSiKSnesAXqYBM=; b=PxKgk8S+q0TmWU+JBes7aueKdbnc++5Ltn032797R8AT8GyGXhbbQIpW0ry09gN6dUrCV0H9RCeKiVPpuQRYUJsa6de1NvcB/VdBuWwqhpP36ynOBdllNEtb1Bex95uTn/EbWbhS/u78amhnlfywE8aGg2+cgiWkoAho4GYj4YQ= 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 1592825387223969.308549794413; Mon, 22 Jun 2020 04:29:47 -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-476-26xzlUTGOROfC76cKly3oQ-1; Mon, 22 Jun 2020 07:29:44 -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 25EA5100CCC1; Mon, 22 Jun 2020 11:29:39 +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 083EE5C221; Mon, 22 Jun 2020 11:29:39 +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 CF6A0833D1; Mon, 22 Jun 2020 11:29:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05MBTUaK019579 for ; Mon, 22 Jun 2020 07:29:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id B564E5D9F3; Mon, 22 Jun 2020 11:29:30 +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 632AE5D9E8; Mon, 22 Jun 2020 11:29:30 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 731969D9C; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825386; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:content-type:content-type: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZuarwHpOQc0u30LFTFQMPNO3U8EShjSiKSnesAXqYBM=; b=CJmimU0en56/0vsczWIgKKO163PgvmDTKrOWypOB+wi+ygYmlwLpDwVPZTgv1UmXoCqflq z7mfgJrvd9pcb2oi2sbbARilfv4pg63/ZxP0ynSQhAKoGE/6xkkmKGkmRj79a9zoD+yKpo U9O4QHUM+pvqolBlYxuVtgQGDFQxcA8= X-MC-Unique: 26xzlUTGOROfC76cKly3oQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 11/19] audio: deprecate -soundhw pcspk Date: Mon, 22 Jun 2020 13:29:06 +0200 Message-Id: <20200622112914.30454-12-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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" Add deprecation message to the audio init function. Factor out audio initialization and call that from both audio init and realize, so setting audiodev via -global is enough to properly initialize pcspk. Signed-off-by: Gerd Hoffmann --- hw/audio/pcspk.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index c37a3878612e..ab290e686783 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -28,6 +28,7 @@ #include "audio/audio.h" #include "qemu/module.h" #include "qemu/timer.h" +#include "qemu/error-report.h" #include "hw/timer/i8254.h" #include "migration/vmstate.h" #include "hw/audio/pcspk.h" @@ -112,11 +113,15 @@ static void pcspk_callback(void *opaque, int free) } } =20 -static int pcspk_audio_init(ISABus *bus) +static int pcspk_audio_init(PCSpkState *s) { - PCSpkState *s =3D pcspk_state; struct audsettings as =3D {PCSPK_SAMPLE_RATE, 1, AUDIO_FORMAT_U8, 0}; =20 + if (s->voice) { + /* already initialized */ + return 0; + } + AUD_register_card(s_spk, &s->card); =20 s->voice =3D AUD_open_out(&s->card, s->voice, s_spk, s, pcspk_callback= , &as); @@ -185,6 +190,10 @@ static void pcspk_realizefn(DeviceState *dev, Error **= errp) =20 isa_register_ioport(isadev, &s->ioport, s->iobase); =20 + if (s->card.state) { + pcspk_audio_init(s); + } + pcspk_state =3D s; } =20 @@ -236,9 +245,18 @@ static const TypeInfo pcspk_info =3D { .class_init =3D pcspk_class_initfn, }; =20 +static int pcspk_audio_init_soundhw(ISABus *bus) +{ + PCSpkState *s =3D pcspk_state; + + warn_report("'-soundhw pcspk' is deprecated, " + "please set a backend using '-global isa-pcspk.audiodev=3D= ' instead"); + return pcspk_audio_init(s); +} + static void pcspk_register(void) { type_register_static(&pcspk_info); - isa_register_soundhw("pcspk", "PC speaker", pcspk_audio_init); + isa_register_soundhw("pcspk", "PC speaker", pcspk_audio_init_soundhw); } type_init(pcspk_register) --=20 2.18.4 From nobody Mon May 6 12:04:52 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=1592825478; cv=none; d=zohomail.com; s=zohoarc; b=GsIVQb0Wt9lD2eoVODn7y+s3WXJnGdKl6Teqk4mnaeXTF7KwOdEXLPlkhgSZFjvyuF1HkT0ApYbDHa/PQFJLB+9e+JRDZ+edbJIyD+1bqzS3XzpqLH6RLmPmsaOMpSMIBEnX94yB6JzPXlzcTJjqjOQR9eww30mHzF3moz832Q4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825478; 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=07xaFYKIE9qW2SlciTQpCyKYIBwlhsnNJUMCNLRVWKo=; b=aSOIqzZKjth9R1WgyKcCaJDGCMm8qWe7T7bK/y1c5OiVHpRuF6ElDdzHJQbBxJe5OFZigA7v6m+jRQrv071byVo5ThtVivU0vBdfllS4FgiXJPslAnHG6MeOd7o+/CIf42yoYD5iDGmEdvpnkewYZydG3OP+6J85rOmrcG/mNv0= 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 1592825478301715.7073153561342; Mon, 22 Jun 2020 04:31:18 -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-510-d2Z9Ex2vNLWuW7u7DgxPuw-1; Mon, 22 Jun 2020 07:29:50 -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 E1CD48005AD; Mon, 22 Jun 2020 11:29:43 +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 7B8925BAE9; Mon, 22 Jun 2020 11:29:43 +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 485F1180530B; Mon, 22 Jun 2020 11:29:43 +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 05MBTV5u019590 for ; Mon, 22 Jun 2020 07:29:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7258D27CCA; Mon, 22 Jun 2020 11:29:31 +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 12E9E26DFE; Mon, 22 Jun 2020 11:29:28 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7BC9C9D7A; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825477; 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=07xaFYKIE9qW2SlciTQpCyKYIBwlhsnNJUMCNLRVWKo=; b=QEWPqRf4cepyW4FVKT9do2j0shq45o/wg+MWd4WF29MsxSETT3Gdq4Dm9qkKkuTIvvKNu5 HvDdhNCFd016H59d/mEXN+rELwygbeWqyyoYfmhT1lXfZ5kbqqcpjFwwE3KAaxnir2sxxR /OvEs9BnfAU6IAwEvrvfP0/MhvmX/Cw= X-MC-Unique: d2Z9Ex2vNLWuW7u7DgxPuw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 12/19] audio: add soundhw deprecation notice Date: Mon, 22 Jun 2020 13:29:07 +0200 Message-Id: <20200622112914.30454-13-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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" 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..7ddd9e400745 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 ``-global +pcspk.audiodev=3D``. + ``-mon ...,control=3Dreadline,pretty=3Don|off`` (since 4.1) ''''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 --=20 2.18.4 From nobody Mon May 6 12:04:52 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=1592825444; cv=none; d=zohomail.com; s=zohoarc; b=m0Q9w8BbiP4/etcwqNp8/35P3uU2u0koOaeuk/JsGdkgQCZrsFvNqOJDw0VFtvZNzIrDDelpqZCsb2rxzetFwM/rJRhf1Xcwx9NErQW0Eca08LA2zH7IbnHiKfZXJKxb/zV82ur5GHT3s1yrzUQaumjoHS8sVWDMotlLi3aimtw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825444; 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=IpPfGKgv8QM9c7ss86IPGpTgapndMg58Tqodm5GfcXoOKzzYipLhjRHMlzMNfNy8nQUF6ncAMvROu7/CNyzvm9NAvMwNnwkewJIa9trzD3Un2hBlLNpIkFvKmx+fcgO6vmcCKTQ/Lvg/ds2gJmlVz4nKN3mwHltFjCUWdNv5+bE= 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 1592825444035137.7022863569448; Mon, 22 Jun 2020 04:30:44 -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-P3opIfPlNTKshNRHcsbQpA-1; Mon, 22 Jun 2020 07:29:48 -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 7F65A100CCD1; Mon, 22 Jun 2020 11:29: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 5C56171680; Mon, 22 Jun 2020 11:29:41 +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 2A7DC833DD; Mon, 22 Jun 2020 11:29:41 +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 05MBTSs4019546 for ; Mon, 22 Jun 2020 07:29:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id A91FB27CC4; Mon, 22 Jun 2020 11:29:28 +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 32423272D3; Mon, 22 Jun 2020 11:29:28 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 896879D7B; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825442; 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=danVy6H/OVVTU73quZGSkyWmzkB/Y7H+S3gb5FO5bngcG1FnerhDaGiCq50LTZ2Qa3u4H8 ovQU7FBgyNG9tVLkwaex8fRLvsR6nrEkYz6HwMnsswxX/1RyuY5jNl1GhqhhUd28ZIdXaw GmIF6jmwVdDxAHwzNtrp9DVdyM0HJZY= X-MC-Unique: P3opIfPlNTKshNRHcsbQpA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 13/19] pc_basic_device_init: pass PCMachineState Date: Mon, 22 Jun 2020 13:29:08 +0200 Message-Id: <20200622112914.30454-14-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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" 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 Mon May 6 12:04:52 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=1592825404; cv=none; d=zohomail.com; s=zohoarc; b=Tz5sRmAuaR0Exw1DsL6s/l6eo/yL7a5Q5bycUV8s2HSYiburZdYX95WMiBSwf1z8UqoBLOTKACIorGd2ho08tLNGZnq1zVqmDZmJPImaNgc9QtFS7D1ri+UK1i8/wNoE9wMoee0YoRgMspiubNzqOKlzvUkAJtB35Txa4BYzTfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825404; 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=B0uZIVd1wLDcZVro5O+Od7x28Mexf6omaWXP6afNRBb4G2SFsPvzzA3Z5ErIB2N9onkwAaxvRfUHOE3A3v5q4V01fxfibhw/gPWNupY37qn+4acgWfCcN8RQbJJH1fkwZGeHjUPQDvkxUblOvsBQ0/8qzZgv/ddCkGMX6cT3l3c= 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 1592825404942411.81742959528844; Mon, 22 Jun 2020 04:30: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-211-eCgexd1bPZ2ke3Mr59kNYA-1; Mon, 22 Jun 2020 07:29:44 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3A9A68018AC; Mon, 22 Jun 2020 11:29:39 +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 19FB426E44; Mon, 22 Jun 2020 11:29:39 +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 E0C73833AB; Mon, 22 Jun 2020 11:29:38 +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 05MBTSwq019541 for ; Mon, 22 Jun 2020 07:29:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 975C07167C; Mon, 22 Jun 2020 11:29:28 +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 317277166A; Mon, 22 Jun 2020 11:29:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 96F469D7C; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825403; 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=afKHAGA0Rk+9lPvjyKSsr1VELt4XbaQgkYT7lCQifLK/T7ppSIQjN3pP128F0fztIWVKYQ 5ssJRIcwxy89nnlVipQTopXg+kPxwZ9gLDgN250Yy+k9tOtxl8P4eR80Mo3t8Ykf+yvRmL hNF/rRIG1wngtoXylnEKpm338qiMBRg= X-MC-Unique: eCgexd1bPZ2ke3Mr59kNYA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 14/19] pc_basic_device_init: drop has_pit arg Date: Mon, 22 Jun 2020 13:29:09 +0200 Message-Id: <20200622112914.30454-15-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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.23 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 Mon May 6 12:04:52 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=1592825385; cv=none; d=zohomail.com; s=zohoarc; b=JEWf3knAZRt8JlymwkWHvjbuMjkjdcLJlPYfE5pgxFiZsbZjbx61YWqbM7qIW96TSlnzr3K/k0sUJgSlRx/d6MZwxRgZjqqJ82Q/Clx21Ax/6SKSZtDEz14W3JuPB25ZpKbzVIZCyHt9Tvb4M6ZErJwKL6jeujwr09MQLcj9E1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825385; 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=hqeiCGwdVKrbFRh2JuEalXMdIsWRqzXbpn5FSFrlz7RsfWyoi953yr0bj4LRYyUAt99+XDl8vYT4nMSUSgj/iHLtpHRU0bpzSVKnKie2tkauVg5+CyQ78ucUtsogqNolj1s32cTsqQ1/myBpIWFFx4P0u3dnr0f3vSOzLU+YtvM= 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 1592825385217623.272466336405; Mon, 22 Jun 2020 04:29:45 -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-293-77sGN32fNfuuZ0L-1_LJ9A-1; Mon, 22 Jun 2020 07:29:42 -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 B3E77EC1AD; Mon, 22 Jun 2020 11:29:36 +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 94C685C221; Mon, 22 Jun 2020 11:29:36 +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 66A31833CE; Mon, 22 Jun 2020 11:29:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05MBTSOk019535 for ; Mon, 22 Jun 2020 07:29:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7BE6A5D9E8; Mon, 22 Jun 2020 11:29:28 +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 1639E5D9D5; Mon, 22 Jun 2020 11:29:28 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A4C4A9D7D; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825384; 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=P+6cEbdhKNG4R9NpF4EGqhaYIeACUvnKHq5yzZbSIEosOOHNxj+2pUo9aXcQkGeNzqRYrB ahCu8Nnt8RUBS0hDHhaZHoHrTfR1hCOlsAvht4T10ai2s32KNfY7Z/HhND22xDptNM/vuL 2XcH9+0tdVso/926RyOlkeI/Fi+gueA= X-MC-Unique: 77sGN32fNfuuZ0L-1_LJ9A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 15/19] pc_basic_device_init: drop no_vmport arg Date: Mon, 22 Jun 2020 13:29:10 +0200 Message-Id: <20200622112914.30454-16-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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 Mon May 6 12:04:52 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=1592825389; cv=none; d=zohomail.com; s=zohoarc; b=MQJLn3QZpSu0LUYcbWaT4sVjkOKesAZ0jh3aJIT0gbIBuVax+JL3qYDwqzLoaKscIy26DHGQBTW6l3FTxQbecHy76ITGVwOLpTF2Bhu1EaNucIJcWmUz9HASL4+U3wBhrKxxpvept4qvg01PGWBT1qD9RUjKFAFn51hRAf1F68I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825389; 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=yL3OSn9AFp67GuusEB0cjy9wuxWUIYUekJFueTqvHJI=; b=nhk9r5tFQZ9LBgBkhHYAaS5BV3X0lRODxN7CqZtn9YbKkm7y1UsmDI3P8E9CjPEtX9QIXN/LBS2PCTAT8pAbVZD2FIvnRx9/gh5sTl9mWYp5o5ExHJ2diedQPaAsKO0edvrtOSuN3tZCJAaQGRnlok0tRqIoD8iPzeDcIP0HQ+U= 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 1592825389328597.8640789021156; Mon, 22 Jun 2020 04:29: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-47-BMTInnuRNMmJFjNxaLfCSQ-1; Mon, 22 Jun 2020 07:29:46 -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 EDFDE100CCC8; Mon, 22 Jun 2020 11:29:38 +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 D00A77166B; Mon, 22 Jun 2020 11:29:38 +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 9D07C1806B0D; Mon, 22 Jun 2020 11:29: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 05MBTTdM019556 for ; Mon, 22 Jun 2020 07:29:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1EE175C220; Mon, 22 Jun 2020 11:29:29 +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 AAC1F5C1BD; Mon, 22 Jun 2020 11:29:28 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id ADA009D7F; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825388; 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=yL3OSn9AFp67GuusEB0cjy9wuxWUIYUekJFueTqvHJI=; b=Y3uptRoxfcB8qEJn7QmEdkcL4CbV4NrfTXJyrBSRJ5vI/yTQxgQJ4bpx0qySXQxLC4TiFA PRRiJKC4B3z150UBB9WQxonmJK6lYW9bsLRTx84g2izNNjEGSL3yJoAn5aGd0zjk8R+562 6DqKqjpWWlY7f9EiJZQGF8b+c4ZtM48= X-MC-Unique: BMTInnuRNMmJFjNxaLfCSQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 16/19] softmmu: initialize spice and audio earlier Date: Mon, 22 Jun 2020 13:29:11 +0200 Message-Id: <20200622112914.30454-17-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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" audiodev must be initialized before machine_set_property so the machine can have auiodev 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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index f669c06ede4a..b8dc1f5a0e86 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) { --=20 2.18.4 From nobody Mon May 6 12:04:52 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=1592825464; cv=none; d=zohomail.com; s=zohoarc; b=BQKW9VrMQ1TJTN7HiC58OmDpy2QpK0eFgrP09lwhDp5tKZHbEZqBS7/IY9xjRnoIZ4VR+lhDHlLwerG/oB2njEPmR3ooBsAmtbaRu+7Pwi/fMmhJPtPhmbSfiybK4nYuYm1T5O7lnocpGSoNlfLnf5wt+9JBPzJpns71IRkvW+w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825464; 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=jmUHsq2DsrWk8iZVPcay1JqZhPBZFOsXyMP0t/7bZ1/8tPhS53FDebG4KfMkaieUm9aar4ht7tvFJjwww34FkwnCWdYQl69TdpKsoUSusxX2TCmVIOUfK9SiH0p4d9FWlkGyGTeCTpHvfhFh4E2MHZHNLx9awy0scwTQgxG22q8= 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 1592825464302607.688770821538; Mon, 22 Jun 2020 04:31: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-126-GRS1bVQJNRCSKrCo3riMIQ-1; Mon, 22 Jun 2020 07:29:46 -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 4DFD4EC1AB; Mon, 22 Jun 2020 11:29: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 2ED085BAD0; Mon, 22 Jun 2020 11:29:41 +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 F24AA180CB39; Mon, 22 Jun 2020 11:29:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05MBTT3m019562 for ; Mon, 22 Jun 2020 07:29:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 738895D9F1; Mon, 22 Jun 2020 11:29:29 +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 0C5BD5D9D5; Mon, 22 Jun 2020 11:29:29 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B9B209D01; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825463; 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=c3kPxsde/dXQhpQYZEsIkB1jY8GzqjZXl8SObwpJRf+sPi365uW2BPN2OcEl0xVuZ+JLtq YJ3YbzL4Pbm4LMAckDZdrmz3aKW2oJQN5aHlrbmviz8P/YKO5KViNdQFx9qpJpta5SjX9N xr+ZEPY/yeWCZNj3FYMdPp/5Usn7rCw= X-MC-Unique: GRS1bVQJNRCSKrCo3riMIQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 17/19] audio: rework pcspk_init() Date: Mon, 22 Jun 2020 13:29:12 +0200 Message-Id: <20200622112914.30454-18-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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 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 Mon May 6 12:04:52 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=1592825393; cv=none; d=zohomail.com; s=zohoarc; b=GVSHI/vJKLGgjiorP5YBtmxl58Mk3lRGhtOtGc6ZovmalBFW9ONsOhZe3f1tY/tpbsy52BjPU+mQUtHxeSCRdpDsKNnKzTTttWT+Ejy60heJ+Yt0QlCRTKWbpcRPaDbSQ23z4gHLEjbIFPuVET80UKzM7Xkb0HsFvSIq2RJGmY0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825393; 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=n9gEp/xzU4Jl1uFmXCKYIOaUv/dWWxCJ7gLxetTRaDc=; b=Qic3jg33peJ6B0oMOANmX+OLr+1qGpCW65IrrXJgNOKE3rpvPFjokg1Kcs3SuZYOaBgfWy4+uSW/iPaeLSOufW1J5pMtEsFoR+4NMa1z8HaIl/oFRf/Dll6MpoRaJfTxj/mz6Yxodyg423J8PumeQ3CW6uy+QKfy1ejaK7kV340= 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 1592825393469913.3207468872615; Mon, 22 Jun 2020 04:29:53 -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-481-TfRnthaVNYmcKaY9ktoGqA-1; Mon, 22 Jun 2020 07:29:50 -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 AE9BA100CCD7; Mon, 22 Jun 2020 11:29:43 +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 893191000329; Mon, 22 Jun 2020 11:29:43 +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 58D9D180530A; Mon, 22 Jun 2020 11:29:43 +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 05MBTXiM019609 for ; Mon, 22 Jun 2020 07:29:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id C81F45C298; Mon, 22 Jun 2020 11:29:33 +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 6FCE95C221; Mon, 22 Jun 2020 11:29:33 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C5BA39D02; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825392; 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=n9gEp/xzU4Jl1uFmXCKYIOaUv/dWWxCJ7gLxetTRaDc=; b=Fw7398RNN4HfOJe3rmhozK8NKnoU79KDgAOARLhUBoqAm5eJtK/2vsYN0vziuQsx5U9aAZ GxPXpEqliYO290sRUnyr0MxHGv7Ae2F8BBgmUFGS2JlOs/yXakVEs1BYbJjIdHW9+iOYUJ TOVWTz1n8bmIvTJnpVVO1DE6x3PPri0= X-MC-Unique: TfRnthaVNYmcKaY9ktoGqA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 18/19] audio: create pcspk device early, add audiodev alias. Date: Mon, 22 Jun 2020 13:29:13 +0200 Message-Id: <20200622112914.30454-19-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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" Create the pcspk device early enough that we can create an audiodev property alias for the machine type. pcspk init works now with "-audiodev ,id=3D -M pc.pcspk-audi= odev=3D". Signed-off-by: Gerd Hoffmann --- include/hw/i386/pc.h | 1 + hw/i386/pc.c | 5 ++++- softmmu/vl.c | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) 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..bd393f82377f 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,9 @@ 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); + object_property_add_alias(OBJECT(pcms), "pcspk-audiodev", + OBJECT(pcms->pcspk), "audiodev"); } =20 static void pc_machine_reset(MachineState *machine) diff --git a/softmmu/vl.c b/softmmu/vl.c index b8dc1f5a0e86..e8580ccaa2c6 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -4287,6 +4287,8 @@ void qemu_init(int argc, char **argv, char **envp) exit (i =3D=3D 1 ? 1 : 0); } =20 + audio_init_audiodevs(); + /* This checkpoint is required by replay to separate prior clock reading from the other reads, because timer polling functions query clock values from the log. */ @@ -4344,8 +4346,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 Mon May 6 12:04:52 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=1592825390; cv=none; d=zohomail.com; s=zohoarc; b=MuEgQq/32QNvcrtxh+bzqn3czmIQ6pUaFRFSkaTeZRAmkoJyowBR7jEakg4Dgvm++UauSsbFJXcglKL/xdkxibSN889ZzuqQPucpuacASUsMoKFA7EaBsRCOYpP90utnw6JP1DHBz3Jws8jeWS4Em1pCmTj20cb6GFzS6Id93Mo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825390; 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=fDmSajt2U2leHP+4coSeLvIsSQnLPJ8RX9dc+xljWYI=; b=OX4d4HJ9c/auXLemuSPPWaD1Kup8FNG8TILJ0RJAcCEne/G9g+0pD1PCGqgqBcX7ckqD8gspPdOarZGx1s73WVBZDPsxIy3JL70qasGZzm9a25iXZaO7EaOvfE4Tyj4ktdKUSONLLELfYbBpr0ATsE/8JDklCs8BuZgeXtO+2SU= 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 1592825390262605.39729915288; Mon, 22 Jun 2020 04:29: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-331-axzbe-2eNmy4fLJQB3nFHg-1; Mon, 22 Jun 2020 07:29:47 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B6E5FEC1A6; Mon, 22 Jun 2020 11:29: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 9A4A55D9DD; Mon, 22 Jun 2020 11:29:41 +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 6D9BA833D9; Mon, 22 Jun 2020 11:29:41 +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 05MBTYEO019620 for ; Mon, 22 Jun 2020 07:29:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1F65571679; Mon, 22 Jun 2020 11:29:34 +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 2B5BD7166A; Mon, 22 Jun 2020 11:29:29 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id CFEC09D03; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825389; 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=fDmSajt2U2leHP+4coSeLvIsSQnLPJ8RX9dc+xljWYI=; b=dsHvni2xzHGQsg3PXMSP+YxhwycCKFcBZPWdrmckxSEtiNwE2YoCaj1KGcrxeKnfgLdrbk BVH8cH4mcjM84WSYCwRldetQDoPYXS9crERQExQDwlZTI8i0N1QEXrpYCy8W0C6nKtK1M2 VLJ5+DpeKQ0nCIH09RlC6pwXR+aYP80= X-MC-Unique: axzbe-2eNmy4fLJQB3nFHg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 19/19] audio: set default value for pcspk.iobase property Date: Mon, 22 Jun 2020 13:29:14 +0200 Message-Id: <20200622112914.30454-20-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, 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.14 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 ab290e686783..c537ea62d394 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