From nobody Fri Nov 14 13:38:17 2025 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