audio: enable PCI audio cards for all PCI-enabled targets

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1366303444-24620-9-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index 8a5b565dd9599ee5b72b08727940151468263545..d557eabfb94c3b94f79d427c597750f593554357 100644 (file)
--- 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_VMW_PVSCSI_SCSI_PCI=y
 CONFIG_MEGASAS_SCSI_PCI=y

diff --git a/default-configs/sound.mak b/default-configs/sound.mak
index ed20388affa2e657d0b99c075be4b38680178708..ff69c4d54936bb112cff20b0d6f7710f4eaaae28 100644 (file)
--- 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 da91e7065d202c517d746a6c0a148ca1d397c992..c1113e088ae4526fa0df46e7ab8d51273769c1a7 100644 (file)
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -193,8 +193,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 7ed0cd4a4b7f7399b55fc06f743835d40496a821..d445bdf4cafceec3803064a013fae1d8c93c3cfc 100644 (file)
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -189,7 +189,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 822d3006e247d53f4a799ae6dab16e86181cf19d..94d95702a4ed899568c5014936128619baddfa44 100644 (file)
--- 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 a2d01e158f1038f5a44aff7143fa0624324dce1e..9d521ccb1921a25a6b8e476ee9e3550af5f14e19 100644 (file)
--- 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 82bd27ec8d3a9ac1b0a62ae516d83f251d77d43a..59c7da3af73e4d9b4964acf869bcbb3098caff2e 100644 (file)
--- 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 6668b12014dbf46d3164fd257b9e405ca9e1a692..617ff2ca0a8485f68c4f9cd52bd4ca3d9ae4a5f3 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -4294,6 +4294,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();