@@ -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
@@ -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
@@ -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);
@@ -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);
@@ -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");
@@ -985,9 +985,6 @@ void mips_malta_init(QEMUMachineInitArgs *args)
}
fdctrl_init_isa(isa_bus, fd);
- /* Sound card */
- audio_init();
-
/* Network card */
network_init();
@@ -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 = {
@@ -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();
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- 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(-)