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

audio: replace audio card configuration with default-configs 



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

configure

+0 −7
Original line number Diff line number Diff line
@@ -123,8 +123,6 @@ interp_prefix="/usr/gnemul/qemu-%M" 
static="no"

cross_prefix=""

audio_drv_list=""

audio_card_list="ac97 es1370 sb16 hda"

audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus hda"

block_drv_whitelist=""

host_cc="cc"

libs_softmmu=""
@@ -704,8 +702,6 @@ for opt do 
  ;;

  --oss-lib=*) oss_lib="$optarg"

  ;;

  --audio-card-list=*) audio_card_list=`echo "$optarg" | sed -e 's/,/ /g'`

  ;;

  --audio-drv-list=*) audio_drv_list="$optarg"

  ;;

  --block-drv-whitelist=*) block_drv_whitelist=`echo "$optarg" | sed -e 's/,/ /g'`
@@ -1105,8 +1101,6 @@ echo " --disable-cocoa disable Cocoa (Mac OS X only)" 
echo "  --enable-cocoa           enable Cocoa (default on Mac OS X)"

echo "  --audio-drv-list=LIST    set audio drivers list:"

echo "                           Available drivers: $audio_possible_drivers"

echo "  --audio-card-list=LIST   set list of emulated audio cards [$audio_card_list]"

echo "                           Available cards: $audio_possible_cards"

echo "  --block-drv-whitelist=L  set block driver whitelist"

echo "                           (affects only QEMU, not qemu-img)"

echo "  --enable-mixemu          enable mixer emulation"
@@ -3513,7 +3507,6 @@ echo "curses support $curses" 
echo "curl support      $curl"

echo "mingw32 support   $mingw32"

echo "Audio drivers     $audio_drv_list"

echo "Extra audio cards $audio_card_list"

echo "Block whitelist   $block_drv_whitelist"

echo "Mixer emulation   $mixemu"

echo "VirtFS support    $virtfs"

default-configs/i386-softmmu.mak

+1 −1
Original line number Diff line number Diff line 
# Default configuration for i386-softmmu



include pci.mak

include sound.mak

include usb.mak

CONFIG_VGA=y

CONFIG_QXL=$(CONFIG_SPICE)
@@ -22,7 +23,6 @@ CONFIG_IDE_ISA=y 
CONFIG_IDE_PIIX=y

CONFIG_NE2000_ISA=y

CONFIG_PIIX_PCI=y

CONFIG_SOUND=y

CONFIG_HPET=y

CONFIG_APPLESMC=y

CONFIG_I8259=y

default-configs/mips-softmmu.mak

+1 −1
Original line number Diff line number Diff line 
# Default configuration for mips-softmmu



include pci.mak

include sound.mak

include usb.mak

CONFIG_ISA_MMIO=y

CONFIG_ESP=y
@@ -23,7 +24,6 @@ CONFIG_PIIX4=y 
CONFIG_IDE_ISA=y

CONFIG_IDE_PIIX=y

CONFIG_NE2000_ISA=y

CONFIG_SOUND=y

CONFIG_RC4030=y

CONFIG_DP8393X=y

CONFIG_DS1225Y=y

default-configs/mips64-softmmu.mak

+1 −1
Original line number Diff line number Diff line 
# Default configuration for mips64-softmmu



include pci.mak

include sound.mak

include usb.mak

CONFIG_ISA_MMIO=y

CONFIG_ESP=y
@@ -23,7 +24,6 @@ CONFIG_PIIX4=y 
CONFIG_IDE_ISA=y

CONFIG_IDE_PIIX=y

CONFIG_NE2000_ISA=y

CONFIG_SOUND=y

CONFIG_RC4030=y

CONFIG_DP8393X=y

CONFIG_DS1225Y=y

default-configs/mips64el-softmmu.mak

+1 −1
Original line number Diff line number Diff line 
# Default configuration for mips64el-softmmu



include pci.mak

include sound.mak

include usb.mak

CONFIG_ISA_MMIO=y

CONFIG_ESP=y
@@ -24,7 +25,6 @@ CONFIG_IDE_ISA=y 
CONFIG_IDE_PIIX=y

CONFIG_IDE_VIA=y

CONFIG_NE2000_ISA=y

CONFIG_SOUND=y

CONFIG_RC4030=y

CONFIG_DP8393X=y

CONFIG_DS1225Y=y