From patchwork Thu Apr 18 16:44:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 237700 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2BC232C0200 for ; Fri, 19 Apr 2013 03:17:29 +1000 (EST) Received: from localhost ([::1]:33271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USryg-0001FB-On for incoming@patchwork.ozlabs.org; Thu, 18 Apr 2013 12:46:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USrwg-0006pc-Q4 for qemu-devel@nongnu.org; Thu, 18 Apr 2013 12:44:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1USrwf-0006PP-Ds for qemu-devel@nongnu.org; Thu, 18 Apr 2013 12:44:26 -0400 Received: from mail-ee0-f44.google.com ([74.125.83.44]:38610) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USrwf-0006PD-6a for qemu-devel@nongnu.org; Thu, 18 Apr 2013 12:44:25 -0400 Received: by mail-ee0-f44.google.com with SMTP id c41so1367418eek.17 for ; Thu, 18 Apr 2013 09:44:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=wMdoc/9nKLIhIqHZ5CJLabyRe8mDweiZ7pcTsmYgzRE=; b=GM0VT1EV6c5rke2DNiiSjAw5nV7YLyxA8Fql4H44x1IMiqWn4JAsb49bDqoa9bQhDx 2q/b2Esv3Nwh03nzeG6/FwH5NJmCeiyKpzrqm4WFA9et0VY1qJpEtnOCQ94L42SfCBMA maj6ekiYAWEd7c0OxbY+MtUA798FlaslwDvqABTWEXFjpt2BNg3Mv5f3wUGkTWvyAiX5 QRFQ/I9gN7nf+WPuR0jlvgnwyKL/7rC8k596ZijRyHhmGRFd1vLJ0iWosR92zrQcPO5z 6MyWQ+AGxmt5STxZwn84doy5Smo1Gys4t5oi2+Twt8lCJSqBEcQbeJ4YlEAYvVPEHOkZ avHQ== X-Received: by 10.15.22.76 with SMTP id e52mr32215371eeu.7.1366303464436; Thu, 18 Apr 2013 09:44:24 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id f9sm1873198eeu.11.2013.04.18.09.44.22 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 18 Apr 2013 09:44:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 18 Apr 2013 18:44:04 +0200 Message-Id: <1366303444-24620-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1366303444-24620-1-git-send-email-pbonzini@redhat.com> References: <1366303444-24620-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.125.83.44 Cc: av1474@comtv.ru Subject: [Qemu-devel] [PATCH 8/8] audio: enable PCI audio cards for all PCI-enabled targets X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- RFC->v1: move audio_init() to vl.c default-configs/pci.mak | 3 +++ default-configs/sound.mak | 3 --- hw/i386/pc_piix.c | 2 -- hw/i386/pc_q35.c | 1 - hw/mips/mips_jazz.c | 2 -- hw/mips/mips_malta.c | 3 --- hw/ppc/prep.c | 3 --- vl.c | 2 ++ 8 files changed, 5 insertions(+), 14 deletions(-) diff --git a/default-configs/pci.mak b/default-configs/pci.mak index f5f100e..9506dbd 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -9,6 +9,9 @@ CONFIG_NE2000_PCI=y CONFIG_EEPRO100_PCI=y CONFIG_PCNET_PCI=y CONFIG_PCNET_COMMON=y +CONFIG_AC97=y +CONFIG_HDA=y +CONFIG_ES1370=y CONFIG_LSI_SCSI_PCI=y CONFIG_MEGASAS_SCSI_PCI=y CONFIG_RTL8139_PCI=y diff --git a/default-configs/sound.mak b/default-configs/sound.mak index ed20388..ff69c4d 100644 --- a/default-configs/sound.mak +++ b/default-configs/sound.mak @@ -1,7 +1,4 @@ CONFIG_SB16=y -CONFIG_AC97=y -CONFIG_HDA=y -CONFIG_ES1370=y #CONFIG_ADLIB=y #CONFIG_GUS=y #CONFIG_CS4231A=y diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 1953d8c..8c1e05c 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -194,8 +194,6 @@ static void pc_init1(MemoryRegion *system_memory, } } - audio_init(); - pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, floppy, idebus[0], idebus[1], rtc_state); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 76c378b..73ba8ce 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -202,7 +202,6 @@ static void pc_q35_init(QEMUMachineInitArgs *args) /* the rest devices to which pci devfn is automatically assigned */ pc_vga_init(isa_bus, host_bus); - audio_init(); pc_nic_init(isa_bus, host_bus); if (pci_enabled) { pc_pci_device_init(host_bus); diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 822d300..94d9570 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -288,9 +288,7 @@ static void mips_jazz_init(MemoryRegion *address_space, parallel_mm_init(address_space, 0x80008000, 0, rc4030[0], parallel_hds[0]); - /* Sound card */ /* FIXME: missing Jazz sound at 0x8000c000, rc4030[2] */ - audio_init(); /* NVRAM */ dev = qdev_create(NULL, "ds1225y"); diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index a2d01e1..9d521cc 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -985,9 +985,6 @@ void mips_malta_init(QEMUMachineInitArgs *args) } fdctrl_init_isa(isa_bus, fd); - /* Sound card */ - audio_init(); - /* Network card */ network_init(); diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 82bd27e..59c7da3 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -658,9 +658,6 @@ static void ppc_prep_init(QEMUMachineInitArgs *args) /* Special port to get debug messages from Open-Firmware */ register_ioport_write(0x0F00, 4, 1, &PPC_debug_write, NULL); - - /* Initialize audio subsystem */ - audio_init(); } static QEMUMachine prep_machine = { diff --git a/vl.c b/vl.c index 9e56d77..6add2d8 100644 --- a/vl.c +++ b/vl.c @@ -4256,6 +4256,8 @@ int main(int argc, char **argv, char **envp) .cpu_model = cpu_model }; machine->init(&args); + audio_init(); + cpu_synchronize_all_post_init(); set_numa_modes();