From nobody Sun Apr 28 14:11:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593696423; cv=none; d=zohomail.com; s=zohoarc; b=Jcq/2mak/yBpsw8Iwzu9L/HlZcAxtruBqz7inIZE2rasB6ql86YsjNsO97eiWXRl7tbu1lNl8yBSRUxSsDrTGORXKrxnDWg68YfDtH93ZFjbo+wP8V7il3446sipSMAPHqB64Y2yNA7aEfuRZzVa0PpfpIT8/akmm8c6908+1OE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696423; 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=T5U03EbYPs8RT13OMPNuzovz7eOIImOSBKHvDmWQowc=; b=WKvhrgp282ejFLNik9uFZd3hCM7ia2ipd/uwiwRHxEVVPWFdhU1yxrf+KSAG7QDBc9YUEGSYmA1Rt3JwwjoELDyQ3kWqWKhV2jnTlGp/n8oQny36wR7Xz6GY/sAfBhF1Q3Q+S2ZyYiUXxuFH5UFJUQqqE/k6+TM6qXr6M76gQ98= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593696423353791.4069876799214; Thu, 2 Jul 2020 06:27:03 -0700 (PDT) Received: from localhost ([::1]:60986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqzF0-0006a5-1C for importer@patchew.org; Thu, 02 Jul 2020 09:27:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqzDg-0004hl-Jr for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:40 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51835 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jqzDf-00075j-17 for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:40 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-9-xGceHYU2NZ-cWwtUSYSWtQ-1; Thu, 02 Jul 2020 09:25:36 -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 E4F611940920; Thu, 2 Jul 2020 13:25:34 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F04573FD4; Thu, 2 Jul 2020 13:25:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1CCAF31E87; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696338; h=from:from: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; bh=T5U03EbYPs8RT13OMPNuzovz7eOIImOSBKHvDmWQowc=; b=f8xhBUnLM2uycYlg0ZyBEhZ/WA0mT3GpOhJsRt9rEPTudeYb4M6LUb8PrGadLMqWwScqOO 2xoYFnopdr46xZrHRWqzQH/vAxbaRL5iExtjXMUajxDyD8X1u8PxPrQyxewvpaZev4ktw6 d6e7o0bJsUwzgHtiztUOT7xx26USXO0= X-MC-Unique: xGceHYU2NZ-cWwtUSYSWtQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 01/20] stubs: add isa_create_simple Date: Thu, 2 Jul 2020 15:25:06 +0200 Message-Id: <20200702132525.6849-2-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/02 03:23:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aleksandar Rikalo , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 f32b9e47a3d8..ff0411d21f22 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -8,6 +8,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 Sun Apr 28 14:11:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593696464; cv=none; d=zohomail.com; s=zohoarc; b=QUR7Yeu8WGqwZxkhnMH1a9JdOxou/5tIJQ44w8GOI7Ir2WzZdRU/JEnRJJGfLpVRMity1IAgD5GFSeN0vJ8HOVL0kY6uBab2gC8hA9egdJ0CU8dpZixy258cQkBCZvRoDIBmgCwahUHcAs2Ldud6jOv4ZHkhd6gX23dFFttwYHY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696464; 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=3B7D73osJV34ZpW7kqXjjaJizObZ2jBdfEs5A5DbAn0=; b=dEVr15A7JhyGc80iOh5pMy5xnJaCWlhGWvwGy/GP3EdRSA/2Dr676Tpu1xz0lzz28YDxgLjYUoahIg0wbRD6r9B4xBLIbTVLclRn5jM0SnmCjH+Z5KYqFNP3m40z/AER/sZ2qUYncVYMVZRU/h8+P3cPE9qCaXs8GL4grMjniTE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593696464635634.6097366819469; Thu, 2 Jul 2020 06:27:44 -0700 (PDT) Received: from localhost ([::1]:36250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqzFf-0008LQ-1o for importer@patchew.org; Thu, 02 Jul 2020 09:27:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqzDj-0004mz-K9 for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:43 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:26553 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jqzDg-000770-Gg for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:43 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-342-2VMOCDPFMga6D8VFOZf_hw-1; Thu, 02 Jul 2020 09:25:37 -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 2744F80572F; Thu, 2 Jul 2020 13:25:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F25110013D2; Thu, 2 Jul 2020 13:25:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2737031E88; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696339; h=from:from: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; bh=3B7D73osJV34ZpW7kqXjjaJizObZ2jBdfEs5A5DbAn0=; b=gFzjfq57tKwG8dWGN5V4ZydsuClzi28PQ6bSsKpR/YhO/SmzGzh4bnxV1baP5SFNzcc90V pK++OIiWMzDWFxu6P3WSzUOdj4EFMEOk183098Qguwu095iXFueIjYUScFMNy4+VAeFgGT 1fuklZrmyqsy8uL3TfQ9PWLf6wKfIxw= X-MC-Unique: 2VMOCDPFMga6D8VFOZf_hw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 02/20] stubs: add pci_create_simple Date: Thu, 2 Jul 2020 15:25:07 +0200 Message-Id: <20200702132525.6849-3-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/02 04:00:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aleksandar Rikalo , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 ff0411d21f22..918e46bdc1ca 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -13,6 +13,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 Sun Apr 28 14:11:37 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=1593696614; cv=none; d=zohomail.com; s=zohoarc; b=ZENYRHMWyUOFY0RVLecFALSkPIGhD93Xm1ognyhxRfis0AsBWa8YzZIAC73MTX/K/P1WolgDuCx3PwFUZiUJuMJgGddY+BeoNOHdyxrCEWFkBDSZS+4kntTFCDphLh811asY0cqs5m6wOAAzKIxDea0SpfEQPLzNRlOh/ensuxs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696614; 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=Q86tYn6/8AQmcupDn9uDvGNH1zY/VnFWQ7tK1wJaIFhas6M9fF6JwbTT7ZyG/+RV8TvVdgLsnjBggJGhdPFlo7R86iFUscNGqdHiNNe6am3yG17k0UFHn4S+eqiAtlet+UQd3wGwByBIwEAG5hCbCRZaGDVQmrgQti0Ne4so4Vw= 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 1593696614775199.33145229949344; Thu, 2 Jul 2020 06:30:14 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-80-D15JkXG-P8GRvaDy8vT1ZA-1; Thu, 02 Jul 2020 09:30:09 -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 E9398107ACCA; Thu, 2 Jul 2020 13:30:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C90BC5C1D6; Thu, 2 Jul 2020 13:30:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 985E76C9C6; Thu, 2 Jul 2020 13:30:03 +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 062DPZwS029611 for ; Thu, 2 Jul 2020 09:25:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 09D4B778A8; Thu, 2 Jul 2020 13:25:35 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 200767789C; Thu, 2 Jul 2020 13:25:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3169F31E89; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696611; 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=eAuPxQ3h4J7P0pmgMLZW7fgjB1BRyjj8b0cS71DPbKjHzVvvPLMw2yZGJ8zVfZ18ZoRpJQ ItP8LuTF+TzjPLhllkaD9d9+UIK2QbeStnHRD+iAYSAcZPDGylGQ7lnX4fjYAOqKLTGVkO nuVUg/2moFMvpc8zXqqpa4nUSFqrBJA= X-MC-Unique: D15JkXG-P8GRvaDy8vT1ZA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 03/20] audio: add deprecated_register_soundhw Date: Thu, 2 Jul 2020 15:25:08 +0200 Message-Id: <20200702132525.6849-4-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Aleksandar Rikalo , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , 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" 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 Sun Apr 28 14:11:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593696562; cv=none; d=zohomail.com; s=zohoarc; b=FHsM9VKkwHyxHcqGcG0AzDwdDtqNnyfZtwdvQHBJG4TefmWVndGZjqyKvsmYwEfeAoFZOnSMVclm9dy4lGUEJuutYr3afZMILo78JzB9aYHPTnGkrLoc+qZ053njR9/KV62Yy8WgpYbs4wideIgdy3526qcRa6CGs9JfkPSqGHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696562; 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=eY5fw/kHuHO9dNGqlFPhgNMJcLq4RS5Xhc4kXJ5ul4X6effxe4D4RpXS3TOarGsB7w3efUghyvYdzBo7rQGnau+3FHjV1B09Qy0ZQGM0T20NNiY8UO1EtWK5v/TI3+41woKbVa8cK+8FUjSXVw5WHezn6AOwi9aGEv33wsw5Abs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593696562293543.5785214713553; Thu, 2 Jul 2020 06:29:22 -0700 (PDT) Received: from localhost ([::1]:43170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqzHE-0002j7-IF for importer@patchew.org; Thu, 02 Jul 2020 09:29:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqzDs-0004u1-AB for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:52 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:52805 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jqzDi-00079n-Hh for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:51 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-377-qUsDk2PXNXuP8Ywkc5dmQQ-1; Thu, 02 Jul 2020 09:25:40 -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 DA3B1107ACCA; Thu, 2 Jul 2020 13:25:34 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FFDF17D75; Thu, 2 Jul 2020 13:25:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3C05931E8E; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696341; h=from:from: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; bh=1Vv9AT621ICkypcsTO25i0HBy7rRbjf8YKBPKUfrZtM=; b=Ae7LaSgRny2Iv0sCW5yMCF63NUxwFXt9gFrE5EgoFmmAh28R3ANQ9tOaW5I22Oks6e3Gmo JE9C48F3pxWVwe0hLeTacSWMgbRn+v2JnP+2ckpg6egRC/tEJKUy8VS332pDGILrv7IpeT zQDz/TT/I188D91D+JOSEhinS+LAgd8= X-MC-Unique: qUsDk2PXNXuP8Ywkc5dmQQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 04/20] audio: deprecate -soundhw ac97 Date: Thu, 2 Jul 2020 15:25:09 +0200 Message-Id: <20200702132525.6849-5-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/02 04:18:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aleksandar Rikalo , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 Sun Apr 28 14:11:37 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=1593696907; cv=none; d=zohomail.com; s=zohoarc; b=ML6ILSA36hIY0AkhZqnlLnWrjhGhhvmpwrKMxLT2ZPdzfJLh63noIGeNLtpAii4/z2ASLDP9xRD15V0+elpKxT1on/2O8Dz1mdsYKUQSgXVHRYUpa3t16BD4MFJW/ol76DvOBChC66NVc/AfEka7cj6+lwLkimC/+8TYiqqRB1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696907; 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=Qcz94QZqIxKLb8Jd7CM5iNVm9DoR07nrAvJwB9MhVEUt3IU5YTS9/rfmQv7Cyr1optJAlqHFQzOD5Yl6DwNNIjAJnua6twMdrNpu0Z940t78V6qCzrPDkUoX2g4iWjNcnURlS/vmVG9MGzp4v/TS+OBUf52rE+6g8Jya9TM0ZhY= 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 1593696907258151.47123016124704; Thu, 2 Jul 2020 06:35:07 -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-461-fOEVB7zgMj2AJ0BV2g06FA-1; Thu, 02 Jul 2020 09:34:18 -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 04EF0107ACCD; Thu, 2 Jul 2020 13:34:13 +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 DB0FA73FF2; Thu, 2 Jul 2020 13:34:12 +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 AB65B1809557; Thu, 2 Jul 2020 13:34:12 +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 062DPiUu029793 for ; Thu, 2 Jul 2020 09:25:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2E5DF5C1D6; Thu, 2 Jul 2020 13:25:44 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id E3A175C1C5; Thu, 2 Jul 2020 13:25:35 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 46A8531E93; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696906; 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=Q6wquSoSVxT1V16sZ0FCLJXDd+xrB5GQOVahl8K0wAQ8X6x1o2SeVdZ2qudh3HhGtLfAGE oyyc0uF0p3+lnEsiRrT7xt7WkFtD4llfzFWeLxb3keXVyneg1+KcnMSlZ7QC1dwv7wmuD5 tCdAukir/X9zlLXtKU1IaIP5jbn+g6s= X-MC-Unique: fOEVB7zgMj2AJ0BV2g06FA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 05/20] audio: deprecate -soundhw es1370 Date: Thu, 2 Jul 2020 15:25:10 +0200 Message-Id: <20200702132525.6849-6-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Aleksandar Rikalo , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , 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" 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 Sun Apr 28 14:11:37 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=1593696584; cv=none; d=zohomail.com; s=zohoarc; b=ffDdhZ4UqnOCDeB9Px+UhFfG3EmH4af5leI/kgvNiGz2aj/32hkcYkJ9WzRoPxggRfhR3onKTQOwVXk1qHcfRm5bS9UKoxYuGHQZbEQhH3IC/DmIt+bGZmqfQGZiugGrl2OoLgOKQnlIP1qmvVtnpDHc4NELkBNBBe5DpWGrWH8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696584; 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=a+dP1mP9qFTouAW4bVc85pzF2c2XcG4ScuvuRC5d3l2rueaf75MVUPs2yWWGoLceGWCDwRFzvxQVRl7tDr6Wtz9JwWtoZJ88Sw6TvEgIv5St2C/kSDRxG5QcOi2ko5H05ucm+rznKcWqK0Cbvssfr/P5ILf+pv4wmmazyL5YLV0= 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 1593696584150823.0454904283488; Thu, 2 Jul 2020 06:29: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-414-o63xEOJpPAmknwrce4CK3g-1; Thu, 02 Jul 2020 09:29:40 -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 7CA2318FE86A; Thu, 2 Jul 2020 13: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 5F9BD5C6BD; Thu, 2 Jul 2020 13:29:35 +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 30CA4180954D; Thu, 2 Jul 2020 13:29:35 +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 062DPiav029788 for ; Thu, 2 Jul 2020 09:25:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 20F0F5C3FD; Thu, 2 Jul 2020 13:25:44 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id DAB645C1B0; Thu, 2 Jul 2020 13:25:35 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4F79931E9E; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696582; 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=cuWS5owBQCjqGcY65CK9/xWhFYzrnInGplgE6mOT3dT+k6aoyXbZ8kLoE92R96Tr9CzyCM k5cpqNiLT+H/IsyX7bg9vCGg+vs0kKV2yQQUGQ6HSw59ETfhqnNXBYJ7sOEAegsZ/JD2CX woniuCGa6xiBV9Oj8WOLf7xMiNGTly8= X-MC-Unique: o63xEOJpPAmknwrce4CK3g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 06/20] audio: deprecate -soundhw adlib Date: Thu, 2 Jul 2020 15:25:11 +0200 Message-Id: <20200702132525.6849-7-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Aleksandar Rikalo , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , 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/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 Sun Apr 28 14:11:37 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=1593696569; cv=none; d=zohomail.com; s=zohoarc; b=iAEY9Gq+epM0CaOciNPZLcFX6JpQldbPJdEg7x75ZSuRKpFJiMdZwRMRRGgDzpsGVKq3jKVUjCs8V9C8hx9UdE0IPNh9VyZT/UaNhoBx66XOkJYq2S8BIBwDYHyj2eCIuQ7vMAy4rv6RsmSql3QGDN+wJSSkEX+CQbJKguV4Sjg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696569; 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=Tmfud5V1UhjMJBz8hwS9pAXkj8LGWMwhSi7otrY09HLESvypzqcMbMkDLargHAiDonhnzqRX053Mdew+mr0arT3shAeZZKOUm9jVmArmfPMzUmYqgEB2FQ0opQD5OHGlEMOjjoGSyi2D546nQHftZPua5+dGpe307Onfdq+BamU= 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 1593696568967795.767032328744; Thu, 2 Jul 2020 06:29:28 -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-106-cR3VUuujOWm5vjxuUya3Yw-1; Thu, 02 Jul 2020 09:29:24 -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 9DE5010059AA; Thu, 2 Jul 2020 13:29:17 +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 49B5F7923E; Thu, 2 Jul 2020 13:29:16 +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 01F4A6C9C7; Thu, 2 Jul 2020 13:29:14 +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 062DParF029623 for ; Thu, 2 Jul 2020 09:25:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 18C4F73FF1; Thu, 2 Jul 2020 13:25:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id BEC4373FC7; Thu, 2 Jul 2020 13:25:35 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 5854A31EB4; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696566; 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=HrPf/n49gtVoYvCKLH9NyANwR7dM70eYew26cBrZtyyryHv26jUgjnZuPt5FR5F1lkH2jc fAopfXd1WmZtQuCfTUvE4jQiLEzEW+0yl7BrlcY6P1F0nyciZ2L3N1MK0Og/6B2ZfSh2Ls FhRJ5QGuV64kEF4drv723m0Jg6EUk5E= X-MC-Unique: cR3VUuujOWm5vjxuUya3Yw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 07/20] audio: deprecate -soundhw cs4231a Date: Thu, 2 Jul 2020 15:25:12 +0200 Message-Id: <20200702132525.6849-8-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Aleksandar Rikalo , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Richard Henderson X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Sun Apr 28 14:11:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593696432; cv=none; d=zohomail.com; s=zohoarc; b=nr9ylw3YKyUZb6EH+ojA5siqMK8nYGDpfRVsP/HSDwGI3kKgejYyIA93dQU6Jx74gFOG4XQcydOe/YjXbac7YFBhBS9WAVEvy/US92KJTHnyMz8HyvWInPViqm43suLzB9gfy6il0NDL86ynxfHMhupSsvr90dy8xuNdSTCWphA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696432; 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=ZPBinyD399han+lJniHHdzkAOVRlATeQRmfK3cLQyWSOj8AOz/3yBBdigZdOnpV6hsiImbxR9J6EQfIewAjf9L8m+Z61yGtRz3nwxF8cCuTBH/hu5RXylEcj4lx8RL3PXRJ8muJf7FVFPTRFgKTbbOAO9UI7xiCmuA+THoTZKE4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593696432409539.0358442735034; Thu, 2 Jul 2020 06:27:12 -0700 (PDT) Received: from localhost ([::1]:33630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqzF8-00070p-UI for importer@patchew.org; Thu, 02 Jul 2020 09:27:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqzDi-0004lD-Pf for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:42 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:26024 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jqzDg-00076q-6m for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:42 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-360-ri807M6hP9mgCiW7zLa4LA-1; Thu, 02 Jul 2020 09:25:37 -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 33586108BD0D; Thu, 2 Jul 2020 13:25:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id C998E73FCC; Thu, 2 Jul 2020 13:25:35 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 612B031EBB; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696339; h=from:from: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; bh=gVUjyxcdLlcziLhdHf0nYU2aUMoIqN9LBjMS0HaSfgs=; b=QsvdI0uw6Ofrt5LUSu8NvLqo4WfG6RBeKcF4StGghwHERaPP0B04w1GLNbF3Xo/7Of+Y1w FcDnMzUCJoBgYx7czXR4CwV2UNsdvjds7J1qtmSkoxlWaHrSGUd+uI+jFBW1CAujaYXZro yX2FdVd8xltOFctWaCNQVtVIptpV81c= X-MC-Unique: ri807M6hP9mgCiW7zLa4LA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 08/20] audio: deprecate -soundhw gus Date: Thu, 2 Jul 2020 15:25:13 +0200 Message-Id: <20200702132525.6849-9-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@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=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/02 04:00:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aleksandar Rikalo , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 Sun Apr 28 14:11:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593696835; cv=none; d=zohomail.com; s=zohoarc; b=lpVarqKkmqE/K1I/EfgDTo5S+Z9OeFE31yEtZD6di/rA77eQHChtXGzyVSMmls1gj72mNfFVSwNxmmMY206gHy8GgQODi2q3krX/q+D0+k4HiBn7zbkVjHuQYuVNYvIuck5r/dNR1J8CQix3utNt+ivkiFweNmnwcBN1LIPcjzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696835; 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=hDni2XdkCB6budAOB2yLUqLX0BEYefKxTDWPZT5oReluR4Tzzxg5JGEwnDy9WomUha8AHXARXmuBHGykVmir5Q5TcQQ8EgNogXsjMxhC5fZOekX4SqJpuIesM5uOc+a3j7AYIbXGLVgFctzKdATyjtT8lCOWVNBU5G+O/N+8wAg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593696835738965.8733350803882; Thu, 2 Jul 2020 06:33:55 -0700 (PDT) Received: from localhost ([::1]:60828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqzLe-0002E9-CJ for importer@patchew.org; Thu, 02 Jul 2020 09:33:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqzDy-00051U-7a for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:58 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:32056 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jqzDo-0007E4-54 for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:57 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-512-IdcmyS39MFODuj-Jt1FUNQ-1; Thu, 02 Jul 2020 09:25:45 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4FC9C805EEF; Thu, 2 Jul 2020 13:25:44 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id C486660BE1; Thu, 2 Jul 2020 13:25:35 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6A5BD31EBE; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696347; h=from:from: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; bh=d/a9Ntks1qykABzxoA+2KUfIStVfCwWOvIGdJEEdgOA=; b=VqdUIo/ZuHixO5PIvF9D+bNT/KVoe0lAprfMTVZmSnt85x4jgzDhafgGzL57GeWVm+K3vn nCsMYTQ8DkTFhTazBvtmNN+4IIhpw2jxOsiAkdx/o9yhvffgKDjL0H59/hswF6eHNwnciS rp1CMyGOgFn+zWRsXdDSBOyXDJAJK4E= X-MC-Unique: IdcmyS39MFODuj-Jt1FUNQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 09/20] audio: deprecate -soundhw sb16 Date: Thu, 2 Jul 2020 15:25:14 +0200 Message-Id: <20200702132525.6849-10-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/02 04:00:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aleksandar Rikalo , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 Sun Apr 28 14:11:37 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=1593696866; cv=none; d=zohomail.com; s=zohoarc; b=HztXmMt0bGf3PXODHIdX7E3GRiuM1x0ROrC1TK2Y5AById4GHRkPS0LIPR7I6fIAqGP0GBlL6BKjwwoQimET/xLUd66u7c/1RNV5OWCTfkaEWk22Jywgo/yiNuyH/cw5OhWHldFl4GW7BscYlLtgN59Ub8EIuFe57g74nrvWjRU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696866; 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=bm9ennMmgak/fLZ4lgzr9vCLxjcnZbADeWoeb8porLgmOnHG302uNwOq13eOlT3Q/+QagURAetEzIZQxwXsXBvmGQwxChF2uQxVcyonuyHYu8/Vg2s6XMMjgwgPCsovlFK/oTPvgHYJD+iENe1jjD/ZKje/YLrt3c/1yE9nrBvQ= 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 1593696866418766.6059529195456; Thu, 2 Jul 2020 06:34:26 -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-257-PlPSKOymN--qRUwfRtOxHA-1; Thu, 02 Jul 2020 09:34:23 -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 B4B4B805EF3; Thu, 2 Jul 2020 13:34:17 +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 971311D1; Thu, 2 Jul 2020 13:34:17 +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 446F5180954D; Thu, 2 Jul 2020 13:34:17 +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 062DPifS029808 for ; Thu, 2 Jul 2020 09:25:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 74E372B4C2; Thu, 2 Jul 2020 13:25:44 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id D198646; Thu, 2 Jul 2020 13:25:35 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7336E31EBF; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696865; 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=asKdp9K2JrfxCUziBsD4rZGFWMDMaAQZQzkxjNN1ubVE6YmTRC5Y0sRgZyyabGFLNVJEQS s0YTqFPPVJv1SuBeJXzhUIyi1se+gmKfPC1QB5HJ6RSoMSX6MrPL19UK0FdUE0uaIhx0/c 1uz+9GrwOteCMF65+3RxgXQl+rDmGwk= X-MC-Unique: PlPSKOymN--qRUwfRtOxHA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 10/20] audio: deprecate -soundhw hda Date: Thu, 2 Jul 2020 15:25:15 +0200 Message-Id: <20200702132525.6849-11-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Aleksandar Rikalo , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add 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 Sun Apr 28 14:11:37 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=1593696587; cv=none; d=zohomail.com; s=zohoarc; b=B3UykTR/52KDv9LuBwh7ZmaGJCMVUmWaS5FpiiaPE976OY4vU1mZsNl7hf1mLa+jJyG5Mvrspc0CEMUsJRE5TjS2R1zk0UnPWWYffmGZ2b8PRQ1BANKuO0WQJ7BBPGtxICnHVJ4gYa29vWxQUvqTdqB/iTKXxqN5t/GOdi3vJSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696587; 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=78ZqT/uZ8eziZKb6Hd8L36FhzoEDJo7U+60kBi85GCc=; b=ZXQNFaDtFsuG3EKa9NsAY4CcdKpl+tpwzbXGzoZUJuued5ayN2TqFmZVQ37HdOr9M21dIopHYOTOasODevqQX5fcUJR3WswtJ5c6zzKwVLU1ZHzjKOLBgbNoVPkOuORdMpjumGOGaI2bzMP6h9JuewAkKZUUtFtkN1hPkWwrebY= 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 1593696587096899.8360284794751; Thu, 2 Jul 2020 06: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-443-S9jXqDJTMVeGV5qW7BeJaQ-1; Thu, 02 Jul 2020 09:29:44 -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 B5B2E10059BB; Thu, 2 Jul 2020 13:29:37 +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 9941C73FC7; Thu, 2 Jul 2020 13:29:37 +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 6D2196C9C7; Thu, 2 Jul 2020 13:29:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062DPiJI029798 for ; Thu, 2 Jul 2020 09:25:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4411B6106A; Thu, 2 Jul 2020 13:25:44 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id EEE1160CD3; Thu, 2 Jul 2020 13:25:35 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 80EB431EE4; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696585; 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=78ZqT/uZ8eziZKb6Hd8L36FhzoEDJo7U+60kBi85GCc=; b=W25txTqAk5/JppqRiSy8aGRL9OPeg9uVuZyyC8LqWbXzAN9BNL1NOaBc4Jgc+HGC3Y6hA7 TGtZp0paQE63Xm8C74nkm8jpPqXvtUuZ+/U2GnqXLGTvjhCO7lwEbTjI1siVfV6hWUxLdh V6h3wWSPOu1BLzz1A/wJfdAHRUI7fRo= X-MC-Unique: S9jXqDJTMVeGV5qW7BeJaQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 11/20] pc_basic_device_init: pass PCMachineState Date: Thu, 2 Jul 2020 15:25:16 +0200 Message-Id: <20200702132525.6849-12-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Aleksandar Rikalo , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , 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" 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 dce1273c7dad..3a601dbe71da 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 4af9679d039b..d89e577f6fa1 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1155,7 +1155,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 1d832b2878b1..a3b416507286 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 047ea8db28ea..b16e22c6cccd 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 Sun Apr 28 14:11:37 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=1593696578; cv=none; d=zohomail.com; s=zohoarc; b=a0ztnG708+EEY4W3zecZ3n37AOFvCo9gQZYsfU3/AjsTb6Bu/C1qBArXNPlCoCV8L2Ewu4nBKW/VA1dX0VcmuW2s0/GSW+taGMJl9ZDLYQSSpHijPG3sp3s/RXjzz4wY5nmrlxwQq+c6Tx3g++lQNwGtwPxq81p3i7mJMrdnuyA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696578; 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=DCktsogY5ViSsrgbmsMmUK6Vk4nNpdKC36P+KUHDu3g=; b=kF+wTbG1WxQ8K5g6vVmlPVo/iEXn3o5qePRCibcMbjEn7x2BjoYkgDzETYLdz8jELfXei/y7LRa0Jzq4SxIRSp7bGLrSFpvE2wHVrtpvkDm0yThzJRNqwe65pjHovDnN5ZysALFk13+QpqD7dcWxmytZr9uUXCU/Sr5Zdky9A4s= 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 1593696578207293.79580668062613; Thu, 2 Jul 2020 06:29:38 -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-37-yQIetvmFOU-X-AJMPMnoNA-1; Thu, 02 Jul 2020 09:29:35 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BB28A107ACF2; Thu, 2 Jul 2020 13:29:29 +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 99CD960CD3; Thu, 2 Jul 2020 13:29:29 +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 6A4216C9C7; Thu, 2 Jul 2020 13:29:29 +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 062DPavc029638 for ; Thu, 2 Jul 2020 09:25:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4CC0F73FCF; Thu, 2 Jul 2020 13:25:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id E90CF73FE8; Thu, 2 Jul 2020 13:25:35 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 8EB2331EE5; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696576; 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=DCktsogY5ViSsrgbmsMmUK6Vk4nNpdKC36P+KUHDu3g=; b=XHIPU3baSc4kkb30X72ZWPiHAc4xl0w/D4YlcUMb6Y/aOaStTgE0/yba83eR/xB2GB8RcW XXh40+CJ3Xm27iOq+KIM50cfHmj2Sy11t6uwa4Eon/KNWkDHAatdqLzrSe0XvIrUkSnGMi XNLayhP+GsZAQ+uPMBAoEGVXnYG8fe0= X-MC-Unique: yQIetvmFOU-X-AJMPMnoNA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 12/20] pc_basic_device_init: drop has_pit arg Date: Thu, 2 Jul 2020 15:25:17 +0200 Message-Id: <20200702132525.6849-13-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Aleksandar Rikalo , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Richard Henderson X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 3a601dbe71da..bd447e380b5e 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 d89e577f6fa1..9f5153b6f24d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1160,7 +1160,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; @@ -1211,7 +1210,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 a3b416507286..6c1612d0ca45 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 b16e22c6cccd..6faf4458549a 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 Sun Apr 28 14:11:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593696428; cv=none; d=zohomail.com; s=zohoarc; b=MEsIdFDLRDZsuiJSuysK4tJY7evNxrh0CsHQ+a9Dt8ACI7md0gb1RG2LVdr6G+NTdAcAL2yFiuDP9aSWm7YPXCURDwTBWFoABaoAey1DxWcKa1jOsgBfhKUPkCIQNoCujKJl23yQvNPobSPC5YAiS9ARg+edJVLqP79HIjQUWUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696428; 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=x6QjRF25ShyfYsaZEX5gvuOQ/yh4G2XrTloQFcGPnCs=; b=E+essyuWkSlJvoabp7QDJyR58/ZQ4C0ayUamYtxfhQgLnnhOKMOrvQ3i4xO61d+20SpfwZijMN0HaQoFH18Mr/SIq8PtWhyQymHi87fNyAPDZQf0sk/jezaf+U6HDT3ZlQxE/d/q8DiziCdjejLzO24mc3zWuqpZLS+/4qqVCUs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593696428341450.4795730927825; Thu, 2 Jul 2020 06:27:08 -0700 (PDT) Received: from localhost ([::1]:33264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqzF5-0006n0-0S for importer@patchew.org; Thu, 02 Jul 2020 09:27:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqzDk-0004oG-8W for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:49556 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jqzDg-00077F-RU for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:43 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-394-GTJjzZv4OvqPvgCLL7V6_Q-1; Thu, 02 Jul 2020 09:25:38 -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 D00EC1054F8B; Thu, 2 Jul 2020 13:25:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A58E73FC7; Thu, 2 Jul 2020 13:25:36 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9CA8231EE6; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696340; h=from:from: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; bh=x6QjRF25ShyfYsaZEX5gvuOQ/yh4G2XrTloQFcGPnCs=; b=OIu1gObPJLw1DdPA0kTkjt1TnBpfplhcfJAH81XBVUPRqZGrfssgP5kwxNZSi7W/lJRiIh Dm8igo+785atepH2J9kPRy7doF1NGzltSVPiIHOp9hmwu/mMw5gQ4bQqfyVeUMOcUjz/8X FoSo6UGX3xJw1pDGdBS7zId0AkvyKSc= X-MC-Unique: GTJjzZv4OvqPvgCLL7V6_Q-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 13/20] pc_basic_device_init: drop no_vmport arg Date: Thu, 2 Jul 2020 15:25:18 +0200 Message-Id: <20200702132525.6849-14-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@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=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/02 04:00:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aleksandar Rikalo , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 bd447e380b5e..d7690bf4290f 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 9f5153b6f24d..407c782b5d42 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1159,7 +1159,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; @@ -1226,7 +1225,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 6c1612d0ca45..1ef3f39c55a5 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 6faf4458549a..5f8f21b84093 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 Sun Apr 28 14:11:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593696717; cv=none; d=zohomail.com; s=zohoarc; b=n2TS3rgblJ8MLMF769JH1x6x9d9RZqBwk827ebUhVzs8Wf/V0axJxlHLl9p7sCEYBgGZvyHtehcRlUkjGgR1EleZiPlbvSOtTYremLMGOaGxKJm7GMLXmqlbGIQFm7sAhwfShsY0PO8UTwVYxbuo7HVr8JGkilveF8gJop720eE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696717; 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=SCFpvVKhjNJB4RVup+vYvgNibBnCijNKai5zN6o3Ubc=; b=XPxpXy+T7Hl/ofWAGwHePIvA73U1Pr6ciRiulYSkOVU6FtPTeKW9zucBvvsrqQyZeJHGqBDrbUGasiLmFd2bCIpjKBtZ2evEgNZkba8wgEbpDK2HWi983B96/Q2GJoSJGqTnNaJOvHeJJEZXvYsJrks9GIaPSrg1QXYyntyC23U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593696717164409.2298297275514; Thu, 2 Jul 2020 06:31:57 -0700 (PDT) Received: from localhost ([::1]:52558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqzJh-0006xU-NM for importer@patchew.org; Thu, 02 Jul 2020 09:31:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqzDv-0004yV-1e for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:44069 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jqzDj-0007BS-Uj for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:54 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-51-EPXSc2KpNtKIfiCmESmIAg-1; Thu, 02 Jul 2020 09:25:38 -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 42505800C60; Thu, 2 Jul 2020 13:25:37 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8AE5778A6; Thu, 2 Jul 2020 13:25:36 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A570131EE7; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696343; h=from:from: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; bh=SCFpvVKhjNJB4RVup+vYvgNibBnCijNKai5zN6o3Ubc=; b=K3nNW8ia5TRCLV8FSgTDoCiAlOw+dyBT/Cnz6wficoD4BpBaYb3BCOyM9yo9QaMFTgMNwk rtl2Hw2oyaXe/XT4amrgvEDMTwP8KEwaoTwlZu3KmjI+aQ7UW5fIk7yjhQj+uyz86UhtbD HJ+vPIjw46ZeG7edMYJq3n5o0DRR3RY= X-MC-Unique: EPXSc2KpNtKIfiCmESmIAg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 14/20] softmmu: initialize spice and audio earlier Date: Thu, 2 Jul 2020 15:25:19 +0200 Message-Id: <20200702132525.6849-15-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@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=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/02 03:23:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aleksandar Rikalo , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" audiodev must be initialized before machine_set_property so the machine can have audiodev property aliases. spice must initialize before audiodev because the default audiodev is spice only in case spice is actually enabled. Signed-off-by: Gerd Hoffmann --- softmmu/vl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index 3e15ee243572..8ee91219060a 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -4131,12 +4131,17 @@ void qemu_init(int argc, char **argv, char **envp) fsdev_init_func, NULL, &error_fatal); #endif =20 + /* spice needs the timers to be initialized by this point */ + /* spice must initialize before audio as it changes the default auiode= v */ + qemu_spice_init(); + /* - * Note: we need to create block backends before + * Note: we need to create audio and block backends before * machine_set_property(), so machine properties can refer to * them. */ configure_blockdev(&bdo_queue, machine_class, snapshot); + audio_init_audiodevs(); =20 machine_opts =3D qemu_get_machine_opts(); qemu_opt_foreach(machine_opts, machine_set_property, current_machine, @@ -4230,9 +4235,6 @@ void qemu_init(int argc, char **argv, char **envp) semihosting_arg_fallback(kernel_filename, kernel_cmdline); } =20 - /* spice needs the timers to be initialized by this point */ - qemu_spice_init(); - cpu_ticks_init(); =20 if (default_net) { @@ -4342,8 +4344,6 @@ void qemu_init(int argc, char **argv, char **envp) create_default_memdev(current_machine, mem_path); } =20 - audio_init_audiodevs(); - /* from here on runstate is RUN_STATE_PRELAUNCH */ machine_run_board_init(current_machine); =20 --=20 2.18.4 From nobody Sun Apr 28 14:11:37 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=1593696670; cv=none; d=zohomail.com; s=zohoarc; b=VGsN6KHo9IzrFmwz0NyAPdHP/NMQEjO/CsG4JRcLmZ3RcCEwDApsSebJUt+9vQXNtsqZfiDOaY9Fd/QVRifghyuWYn2rxsDd9gYnoqVL+KNcWIYAGu2WoOS5At+TSkpVkjIiw4yuzKnGJQcA+3Gs/XQ4KIOJ8SG0YTD3Kgrpg2Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696670; 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=V7UuhwSz9UfjrUY4yf3wJyAWOufYbskQbAnShV3hIaw=; b=lieQDfcASVgIy48tLEg+8rOeLauD8eqectQkCDUnQ9mG3UOGeGBHYSVxafBq+Y9t+PkIGP76ottEN870D/Vc5TCp73dSgfBEZqa2fLuW/uR7SCe6IuWlX/ei8r3Y8DmEUVhVmlQcOms/b0En91hFekJImerlC1O3+jPer0hUXZs= 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 1593696670403414.46194687847856; Thu, 2 Jul 2020 06: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-108-w8JxRLMjONGUiypzB4dH3g-1; Thu, 02 Jul 2020 09:29:49 -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 97E05EC1A2; Thu, 2 Jul 2020 13:29:43 +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 79DF35C1D6; Thu, 2 Jul 2020 13: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 4CC0D6C9CD; Thu, 2 Jul 2020 13:29:43 +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 062DPl1c029850 for ; Thu, 2 Jul 2020 09:25:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id B0C007925B; Thu, 2 Jul 2020 13:25:47 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id F17E779233; Thu, 2 Jul 2020 13:25:36 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B358731EE8; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696669; 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=V7UuhwSz9UfjrUY4yf3wJyAWOufYbskQbAnShV3hIaw=; b=b77+JjQoJ6fouzHvJtPzm1W1Q58wPF37iBRrkDYmLgWjgJUjcLtC1/iuKMpz598iV9rol8 CObienN7IkZJPOKnKf7CiUtpYonQ8zyQey5RAoj6WnI11mYyGT+rqw+aMI/+PSpZJdxpvC hcFc+dD6y1fT3yTC0LG32uYwtbOKKHQ= X-MC-Unique: w8JxRLMjONGUiypzB4dH3g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 15/20] audio: rework pcspk_init() Date: Thu, 2 Jul 2020 15:25:20 +0200 Message-Id: <20200702132525.6849-16-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Aleksandar Rikalo , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , 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" 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 +- hw/mips/jazz.c | 2 +- 4 files changed, 4 insertions(+), 8 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 407c782b5d42..4fc1b7048b28 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1219,7 +1219,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"); diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index c3b0da60ccc1..0002bff69590 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -250,7 +250,7 @@ static void mips_jazz_init(MachineState *machine, isa_bus_irqs(isa_bus, i8259); i8257_dma_init(isa_bus, 0); pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); - pcspk_init(isa_bus, pit); + pcspk_init(isa_new(TYPE_PC_SPEAKER), isa_bus, pit); =20 /* Video card */ switch (jazz_model) { --=20 2.18.4 From nobody Sun Apr 28 14:11:37 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=1593696582; cv=none; d=zohomail.com; s=zohoarc; b=DfG1rvO6o0KptxacyYHpKpdScNjVa1SVAstSb0bXn4iSmugdWy53KgGsoON/WgDwQOCGaaSofA3XeKlrirnPIokfYCotJZ9GXGYpB8UsODmyBGzeYgZXfLr2hXG2o/VOsEBTOdm0ah9nZPBha0a2X4iAtjv1/ay7W2z+ds620eM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696582; 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=1XBFvhmM5shzLN1YMzs8HNjfJvha9Xy2lVgHhZwjUDk=; b=HJbRnEB9XHxnjOf3lgIYcfDyCCr5887DXr/MMtbG8iHGW+ftusOwU9WidhE1Ef7BrrEOqW7p52utkEf7smiE1mcE740UY7JtOSUfto2s0PXOpmaysJt5MtHHXXLhK1Qq3bjrCaD8vgY7f6viP6wc2Du5kCKT6PQYLLabvILfH4w= 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 1593696582520483.4906628342179; Thu, 2 Jul 2020 06:29:42 -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-285-42KTHu9HPo242XeuVp9WJg-1; Thu, 02 Jul 2020 09:29:39 -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 003A1804004; Thu, 2 Jul 2020 13:29:34 +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 D380B2B4D0; Thu, 2 Jul 2020 13:29:33 +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 06C1B6C9CE; Thu, 2 Jul 2020 13:29:32 +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 062DPbSR029673 for ; Thu, 2 Jul 2020 09:25:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4E3E017D75; Thu, 2 Jul 2020 13:25:37 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 045625DD61; Thu, 2 Jul 2020 13:25:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id BDE2331EE9; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696581; 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=1XBFvhmM5shzLN1YMzs8HNjfJvha9Xy2lVgHhZwjUDk=; b=Pkq51scKIoo9j5taXCaFx/KjT2wrKBmh53IOkdk4TLk3LgpqnolsLbumg51sKM5+UWAk0Z W/iMuxuvxdxiLKJMhW/D8u4FmFWB8CGxh+RrVv1ALn3zU+fDPiE/lSbeusF4ZlYG/M+kKR wtMhV1YJqX9TdtPUL6jEu84Z+3HK4EM= X-MC-Unique: 42KTHu9HPo242XeuVp9WJg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 16/20] audio: create pcspk device early Date: Thu, 2 Jul 2020 15:25:21 +0200 Message-Id: <20200702132525.6849-17-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Aleksandar Rikalo , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , 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 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" Create the pcspk device early, so it exists at machine type initialization time. Signed-off-by: Gerd Hoffmann --- include/hw/i386/pc.h | 1 + hw/i386/pc.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index d7690bf4290f..a802e699749a 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 4fc1b7048b28..88785f9dcc70 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1219,7 +1219,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); @@ -1891,6 +1891,7 @@ static void pc_machine_initfn(Object *obj) pcms->pit_enabled =3D true; =20 pc_system_flash_create(pcms); + pcms->pcspk =3D isa_new(TYPE_PC_SPEAKER); } =20 static void pc_machine_reset(MachineState *machine) --=20 2.18.4 From nobody Sun Apr 28 14:11:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593696853; cv=none; d=zohomail.com; s=zohoarc; b=NafydVEWqZ7nPBmgt/+r4bWHxQMyTd3RE4KOcq77qZw4Qrc7i4Dy/oeqd1Z9XTXXhHOuobjy/PcT8Cj4cF8Ppa0gvFJfX5yhMi9T3uEheylt2wVNmm+wsUdp7QvwJchIdWA5KCJGH2sgH61RoCaGFaTYV297Y1Usi2RlfvXyHlw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696853; 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=cjFwi5b14nC6S9DRumOMSA9QVtJeL4uece5oCZRvzj8=; b=QUEm5ycAk6iKzT6gG4x9QNmgfPAyUyrUDVeeGZzh79h1FNLHlkYzfSrRU04CSleu1To4pdBmYBYh6YEjqJW+G7qS4XZCAkLXl9M9aW9L1iJNRoR9JCgI64mbT+7qLyosJaB5e5Ip6ZyJkZhoeUrO3M8rkVMwYzszIBW/lilxEKY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593696853645895.6072953289466; Thu, 2 Jul 2020 06:34:13 -0700 (PDT) Received: from localhost ([::1]:34132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqzLw-0002qK-B9 for importer@patchew.org; Thu, 02 Jul 2020 09:34:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqzDt-0004vy-2z for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:54 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:26367 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jqzDi-0007AN-RR for qemu-devel@nongnu.org; Thu, 02 Jul 2020 09:25:52 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-449-9aSe1cDfNvWIMK3jwyG8Cw-1; Thu, 02 Jul 2020 09:25:38 -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 E7644A0BD7; Thu, 2 Jul 2020 13:25:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89AEC73FD4; Thu, 2 Jul 2020 13:25:36 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C8A8731EFE; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696342; h=from:from: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; bh=cjFwi5b14nC6S9DRumOMSA9QVtJeL4uece5oCZRvzj8=; b=Xw7TZoFMh4A8lXbtxzRY1u06BRrFe0i27ewNSI2626fzJsdSSmohKZCfVR7QihPlEwmXx0 0YcZaeFt+1lqhn96Yw3njVhXyf1Kv9OaZIFUqIQA97NGXhmeV+Efn3mFQ3XyES5kO1Fsh+ e++Irv4oO+UKmYqEYHuFZu5k6fW6ak4= X-MC-Unique: 9aSe1cDfNvWIMK3jwyG8Cw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 17/20] audio: deprecate -soundhw pcspk Date: Thu, 2 Jul 2020 15:25:22 +0200 Message-Id: <20200702132525.6849-18-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@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=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/02 03:23:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aleksandar Rikalo , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add deprecation message to the audio init function. Factor out audio initialization and call that from both audio init and realize, so setting the audiodev property is enough to properly initialize pcspk. Add a property alias to the machine type to set the audio device, so pcspk can be initialized using: "-machine pcspk-audiodev=3D" Using "-global isa-pcspk.audiodev=3D" works too but is not recommended. Signed-off-by: Gerd Hoffmann --- hw/audio/pcspk.c | 24 +++++++++++++++++++++--- hw/i386/pc.c | 2 ++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index c37a3878612e..4c7e339ac2b5 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -28,6 +28,7 @@ #include "audio/audio.h" #include "qemu/module.h" #include "qemu/timer.h" +#include "qemu/error-report.h" #include "hw/timer/i8254.h" #include "migration/vmstate.h" #include "hw/audio/pcspk.h" @@ -112,11 +113,15 @@ static void pcspk_callback(void *opaque, int free) } } =20 -static int pcspk_audio_init(ISABus *bus) +static int pcspk_audio_init(PCSpkState *s) { - PCSpkState *s =3D pcspk_state; struct audsettings as =3D {PCSPK_SAMPLE_RATE, 1, AUDIO_FORMAT_U8, 0}; =20 + if (s->voice) { + /* already initialized */ + return 0; + } + AUD_register_card(s_spk, &s->card); =20 s->voice =3D AUD_open_out(&s->card, s->voice, s_spk, s, pcspk_callback= , &as); @@ -185,6 +190,10 @@ static void pcspk_realizefn(DeviceState *dev, Error **= errp) =20 isa_register_ioport(isadev, &s->ioport, s->iobase); =20 + if (s->card.state) { + pcspk_audio_init(s); + } + pcspk_state =3D s; } =20 @@ -236,9 +245,18 @@ static const TypeInfo pcspk_info =3D { .class_init =3D pcspk_class_initfn, }; =20 +static int pcspk_audio_init_soundhw(ISABus *bus) +{ + PCSpkState *s =3D pcspk_state; + + warn_report("'-soundhw pcspk' is deprecated, " + "please set a backend using '-machine pcspk-audiodev=3D' instead"); + return pcspk_audio_init(s); +} + static void pcspk_register(void) { type_register_static(&pcspk_info); - isa_register_soundhw("pcspk", "PC speaker", pcspk_audio_init); + isa_register_soundhw("pcspk", "PC speaker", pcspk_audio_init_soundhw); } type_init(pcspk_register) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 88785f9dcc70..c45e7bfd864b 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1892,6 +1892,8 @@ static void pc_machine_initfn(Object *obj) =20 pc_system_flash_create(pcms); pcms->pcspk =3D isa_new(TYPE_PC_SPEAKER); + object_property_add_alias(OBJECT(pcms), "pcspk-audiodev", + OBJECT(pcms->pcspk), "audiodev"); } =20 static void pc_machine_reset(MachineState *machine) --=20 2.18.4 From nobody Sun Apr 28 14:11:37 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=1593696589; cv=none; d=zohomail.com; s=zohoarc; b=lXh1qLmPLkeQ4ndwSGWyJ/EKvHe3NlfGx8XGmejFfgMkd+nn3Z+PN/kf67LEVmFd+1qoJq5TB+viuzoJZK192WWU6JxZeA1jvJH54TRy8ax+HLS37mxYbMmhbZ+e6R2XhzJ00EICH3AOoIZ06EEnruY94vG2bS2TOKRJRWHGt7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696589; 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=p5kvzk0W5AQ0lvlPi0dlHnsMniTjE2cqvxpNZwYdwYA=; b=cLbG3j2+7QhUBAdPwXAK8VX+iNeIo2erwtSmoaM7kTXG9C9JfU3JmOLNMDgi23rba0mT0jHIaOdbnDEOkdpBAUVJb6Q/VYUtOy1Z8iK5DxmbpYjAOnWzUstFgDpLar9jxll7c1LuHqfz+JETn7j8srWHPD6RzoRcJzdddRfg+Ok= 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 1593696589270501.0465732744035; Thu, 2 Jul 2020 06: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-268-qMsPzWImOx2sS9z7FNYXTw-1; Thu, 02 Jul 2020 09:29:45 -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 EA48A18FE872; Thu, 2 Jul 2020 13:29:39 +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 CB1061D1; Thu, 2 Jul 2020 13: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 9CB3A1809557; Thu, 2 Jul 2020 13:29:39 +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 062DPia5029813 for ; Thu, 2 Jul 2020 09:25:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7F6A61A923; Thu, 2 Jul 2020 13:25:44 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 171F21A91D; Thu, 2 Jul 2020 13:25:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D163F31F08; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696588; 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=p5kvzk0W5AQ0lvlPi0dlHnsMniTjE2cqvxpNZwYdwYA=; b=P22oa/KxjZ70SJyZfmM4Y7yOGxfhsxrTht7N0nYZe49vm8dmg17xiw9KaSxsRxmeAtg/s2 /CDUMTo2IbVOTCey8t1gZ/Qx9hE3WEVfddLFX5GDz7sBsmqZJgXM2fTtyKYSqpNTOu0/Bx W1mcgg4238zmK7Cubyf+LGcySIxmbsM= X-MC-Unique: qMsPzWImOx2sS9z7FNYXTw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 18/20] audio: add soundhw deprecation notice Date: Thu, 2 Jul 2020 15:25:23 +0200 Message-Id: <20200702132525.6849-19-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Aleksandar Rikalo , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , 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 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" 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 843ae71fc618..6aa492b45006 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -82,6 +82,15 @@ should specify an ``audiodev=3D`` property. Additionall= y, when using vnc, you should specify an ``audiodev=3D`` propery if you plan to transmit audio through the VNC protocol. =20 +Creating sound card devices using ``-soundhw`` (since 5.1) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Sound card devices should be created using ``-device`` instead. The +names are the same for most devices. The exceptions are ``hda`` which +needs two devices (``-device intel-hda -device hda-duplex``) and +``pcspk`` which can be activated using ``-machine +pcspk-audiodev=3D``. + ``-mon ...,control=3Dreadline,pretty=3Don|off`` (since 4.1) ''''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 --=20 2.18.4 From nobody Sun Apr 28 14:11:37 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=1593696855; cv=none; d=zohomail.com; s=zohoarc; b=jANlx7TKvx9KNSmpdplhnSxry4t0EXFIZ9p9afXN1bPLBjUIzq6jqtyGPIJWKtx4fb5ja93kWRhKSBS951RSvgSzEzb36cyunCwZsWflGy2PmCbfCS5RJZFL0H9oJl5cy9XTHugyNj2wiF/fVqZyk7hTHjdFEkmXsNZz8szcLwQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696855; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=e90sVaiY0y2bJO1wUVMH2JGLJEwOGOs++Ldelaxq98E=; b=iFacWK9iHMwB2PuNaebQb60C7jrpfthNXcOu3eyS/Yf+NmIaHqOF06dt0YpL6Stjg/cc5eDrlB/XpV1Gp1NHSJ6Q9vfE+fFwJ4L0/PdNFc7VXHvm6ykJxKLOFV2LcXFwV97LAGUe1bXerVU0Y9NGV8n9TjpuEZH7yDIjvSHvqG8= 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 1593696855950553.0892316492786; Thu, 2 Jul 2020 06:34: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-502-kQwHXZboPbasvrgzEKdxDw-1; Thu, 02 Jul 2020 09:34:12 -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 CF5471F194; Thu, 2 Jul 2020 13:34:06 +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 B23D173FF0; Thu, 2 Jul 2020 13:34:06 +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 854E96C9CF; Thu, 2 Jul 2020 13:34:06 +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 062DPbre029656 for ; Thu, 2 Jul 2020 09:25:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 13E1473FC7; Thu, 2 Jul 2020 13:25:37 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACC0A73FE8; Thu, 2 Jul 2020 13:25:36 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id DA2DC31F09; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696854; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:content-type:content-type: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=e90sVaiY0y2bJO1wUVMH2JGLJEwOGOs++Ldelaxq98E=; b=aXNfDsUFVnnYNOXVAEU1ntAsgG0S4oXxUDc+xAfeuNdHpcWV3YGe2HP7HKJx+X9RvbbMri D29gCDVJLJkcSxdyTwbXSWzmGl/R5M2TYr+VypCO5H1mgMQLaGf+1i7LFWAg7m/WbnU1nI fd9Obwgn/O52dBz6we2xj2tcA+K2Qhw= X-MC-Unique: kQwHXZboPbasvrgzEKdxDw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 19/20] pcspk: update docs/system/target-i386-desc.rst.inc Date: Thu, 2 Jul 2020 15:25:24 +0200 Message-Id: <20200702132525.6849-20-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Aleksandar Rikalo , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , 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" Add PC speaker with config hints. Signed-off-by: Gerd Hoffmann --- docs/system/target-i386-desc.rst.inc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/system/target-i386-desc.rst.inc b/docs/system/target-i386= -desc.rst.inc index 47a169e0ae2a..7d1fffacbea3 100644 --- a/docs/system/target-i386-desc.rst.inc +++ b/docs/system/target-i386-desc.rst.inc @@ -31,6 +31,8 @@ The QEMU PC System emulator simulates the following perip= herals: =20 - CS4231A compatible sound card =20 +- PC speaker + - PCI UHCI, OHCI, EHCI or XHCI USB controller and a virtual USB-1.1 hub. =20 @@ -49,7 +51,7 @@ must be told to not have parallel ports to have working G= US. =20 .. parsed-literal:: =20 - |qemu_system_x86| dos.img -soundhw gus -parallel none + |qemu_system_x86| dos.img -device gus -parallel none =20 Alternatively: =20 @@ -60,3 +62,12 @@ Alternatively: Or some other unclaimed IRQ. =20 CS4231A is the chip used in Windows Sound System and GUSMAX products + +The PC speaker audio device can be configured using the pcspk-audiodev +machine property, i.e. + +.. parsed-literal:: + + |qemu_system_x86| some.img \ + -audiodev ,id=3D \ + -machine pcspk-audiodev=3D --=20 2.18.4 From nobody Sun Apr 28 14:11:37 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=1593696858; cv=none; d=zohomail.com; s=zohoarc; b=VJhtzZ4+nov/uGVBdA/6rNAgJQR/6Ee7Gc3oYAQ4H3JQTqbkpiQqhfd762KHvllxhdHRGwdmFlLqi6YNTih4wEwKUeMk/x/uBrX4iTmNvOaDO3DkwZFMK8/1ZRruxoBXrWa0oRPhMm6FkI3kxjTufoAQl65CjZ9+l3g6Q+M1D8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593696858; 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=m0C1OEqGZ+n+wODoEHo4mIYM2MWWK4ZfK8U6dnhFblY=; b=Dxq1BhUo+By4B7hh3H1Wngkbqsyf7Xa0hc4S8ISqA85ZTKQocesxp+wzljryb+5rUQgx4+rZ//3HTle4OG62G8EQ0GB66mOJ5dNEXCj0BIHL5ocOV3vqi1XgSL8BENu6SYNGvcLCWRjZJusBQ4gipaO+w8fRZtqwKUwLTlBgf3w= 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 1593696858278638.0454762335627; Thu, 2 Jul 2020 06:34: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-190-QpnVupAmNIGDKfY7M8SDZA-1; Thu, 02 Jul 2020 09:34:14 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1B24A8014D7; Thu, 2 Jul 2020 13:34:09 +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 EDA2E60BE1; Thu, 2 Jul 2020 13:34:08 +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 C049C6C9D3; Thu, 2 Jul 2020 13:34:08 +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 062DPb4s029681 for ; Thu, 2 Jul 2020 09:25:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 76093101042D; Thu, 2 Jul 2020 13:25:37 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 295F410013D2; Thu, 2 Jul 2020 13:25:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E4AC731F0A; Thu, 2 Jul 2020 15:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593696856; 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=m0C1OEqGZ+n+wODoEHo4mIYM2MWWK4ZfK8U6dnhFblY=; b=Fp/wYMaubaJsF3ISIuawsGKqN7thS8IdFEZcdkyTUpNq4Dcms+t7VlLPM6Stx+e0TU1gDV GS7RpbTdvTolvmtQKeQySVTxADvwrh8cKrBLKHSIe1oWGh8IghyZXLGWDxXSsDNfRpLNqI 42TTddZsllQrnAX1SFl+3RIk6OBjD1w= X-MC-Unique: QpnVupAmNIGDKfY7M8SDZA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 20/20] audio: set default value for pcspk.iobase property Date: Thu, 2 Jul 2020 15:25:25 +0200 Message-Id: <20200702132525.6849-21-kraxel@redhat.com> In-Reply-To: <20200702132525.6849-1-kraxel@redhat.com> References: <20200702132525.6849-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Aleksandar Rikalo , Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Richard Henderson X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Allows dropping the explicit qdev_prop_set_uint32 call in pcspk_init. Signed-off-by: Gerd Hoffmann --- include/hw/audio/pcspk.h | 6 +----- hw/audio/pcspk.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h index 8b485602675f..06cba00b8376 100644 --- a/include/hw/audio/pcspk.h +++ b/include/hw/audio/pcspk.h @@ -33,11 +33,7 @@ =20 static inline void pcspk_init(ISADevice *isadev, ISABus *bus, ISADevice *p= it) { - DeviceState *dev; - - dev =3D DEVICE(isadev); - qdev_prop_set_uint32(dev, "iobase", 0x61); - object_property_set_link(OBJECT(dev), OBJECT(pit), "pit", NULL); + object_property_set_link(OBJECT(isadev), OBJECT(pit), "pit", NULL); isa_realize_and_unref(isadev, bus, &error_fatal); } =20 diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 4c7e339ac2b5..ea539e7605a8 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -219,7 +219,7 @@ static const VMStateDescription vmstate_spk =3D { =20 static Property pcspk_properties[] =3D { DEFINE_AUDIO_PROPERTIES(PCSpkState, card), - DEFINE_PROP_UINT32("iobase", PCSpkState, iobase, -1), + DEFINE_PROP_UINT32("iobase", PCSpkState, iobase, 0x61), DEFINE_PROP_BOOL("migrate", PCSpkState, migrate, true), DEFINE_PROP_END_OF_LIST(), }; --=20 2.18.4