Commit b3e6d591 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Anthony Liguori
Browse files

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



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1366303444-24620-9-git-send-email-pbonzini@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent f81222bc

default-configs/pci.mak

+3 −0
Original line number Diff line number Diff line
@@ -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

default-configs/sound.mak

+0 −3
Original line number Diff line number Diff line 
CONFIG_SB16=y

CONFIG_AC97=y

CONFIG_HDA=y

CONFIG_ES1370=y

#CONFIG_ADLIB=y

#CONFIG_GUS=y

#CONFIG_CS4231A=y

hw/i386/pc_piix.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

hw/i386/pc_q35.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

hw/mips/mips_jazz.c

+0 −2
Original line number Diff line number Diff line
@@ -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");