summaryrefslogtreecommitdiff
path: root/hw/i386/pc_piix.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-04-18 18:44:03 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-29 12:16:57 -0500
commitf81222bc0cf68464fe82117521917cc1533c3ff4 (patch)
tree9c23c1c62ce41a647ab30da7786686a2fe61ece9 /hw/i386/pc_piix.c
parent2e1103f60a871923ecd390804aba07b6031e0dc0 (diff)
downloadqemu-f81222bc0cf68464fe82117521917cc1533c3ff4.tar.gz
audio: look for the ISA and PCI buses
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-id: 1366303444-24620-8-git-send-email-pbonzini@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/i386/pc_piix.c')
-rw-r--r--hw/i386/pc_piix.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 08dd61d1d8..da91e7065d 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -88,7 +88,6 @@ static void pc_init1(MemoryRegion *system_memory,
void *fw_cfg = NULL;
pc_cpus_init(cpu_model);
- pc_acpi_init("acpi-dsdt.aml");
if (kvmclock_enabled) {
kvmclock_create();
@@ -194,7 +193,7 @@ static void pc_init1(MemoryRegion *system_memory,
}
}
- audio_init(isa_bus, pci_enabled ? pci_bus : NULL);
+ audio_init();
pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device,
floppy, idebus[0], idebus[1], rtc_state);