OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Paolo Bonzini 2013-04-18 18:44:04 +02:00 committed by Anthony Liguori
parent f81222bc0c
commit b3e6d591b0
8 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
default-configs/pci.mak
View File

@ -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

3
default-configs/sound.mak
View File

@ -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

2
hw/i386/pc_piix.c
View File

@ -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);

1
hw/i386/pc_q35.c
View File

@ -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);

2
hw/mips/mips_jazz.c
View File

@ -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");

3
hw/mips/mips_malta.c
View File

@ -985,9 +985,6 @@ void mips_malta_init(QEMUMachineInitArgs *args)
}
fdctrl_init_isa(isa_bus, fd);
/* Sound card */
audio_init();
/* Network card */
network_init();

3
hw/ppc/prep.c
View File

@ -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 = {

2
vl.c
View File

@ -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();