mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio: remove HAS_AUDIO

Browse Source 
Several targets can have wavcapture/-soundhw support via PCI cards.
HAS_AUDIO is a useless limitation, remove it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1366303444-24620-4-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:43:59 +02:00 committed by Anthony Liguori
parent 36cd6f6f20
commit ffa48cf5ab
6 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch_init.c
View File

@ -887,7 +887,6 @@ SaveVMHandlers savevm_ram_handlers = {
.cancel = ram_migration_cancel, .cancel = ram_migration_cancel,
}; };
#ifdef HAS_AUDIO
struct soundhw { struct soundhw {
const char *name; const char *name;
const char *descr; const char *descr;
@ -1006,14 +1005,6 @@ void audio_init(ISABus *isa_bus, PCIBus *pci_bus)
} }
} }
} }
#else
void select_soundhw(const char *optarg)
{
}
void audio_init(ISABus *isa_bus, PCIBus *pci_bus)
{
}
#endif
int qemu_uuid_parse(const char *str, uint8_t *uuid) int qemu_uuid_parse(const char *str, uint8_t *uuid)
{ {
@ -1069,15 +1060,6 @@ void cpudef_init(void)
#endif #endif
} }
int audio_available(void)
{
#ifdef HAS_AUDIO
return 1;
#else
return 0;
#endif
}
int tcg_available(void) int tcg_available(void)
{ {
return 1; return 1;

8
configure vendored
View File

@ -4457,14 +4457,6 @@ alpha)
;; ;;
esac esac
if test "$target_softmmu" = "yes" ; then
case "$TARGET_BASE_ARCH" in
arm|lm32|i386|mips|ppc)
cflags="-DHAS_AUDIO $cflags"
;;
esac
fi
if test "$gprof" = "yes" ; then if test "$gprof" = "yes" ; then
echo "TARGET_GPROF=yes" >> $config_target_mak echo "TARGET_GPROF=yes" >> $config_target_mak
if test "$target_linux_user" = "yes" ; then if test "$target_linux_user" = "yes" ; then

4
hmp-commands.hx
View File

@ -736,7 +736,6 @@ info mice
@end example @end example
ETEXI ETEXI
#ifdef HAS_AUDIO
{ {
.name = "wavcapture", .name = "wavcapture",
.args_type = "path:F,freq:i?,bits:i?,nchannels:i?", .args_type = "path:F,freq:i?,bits:i?,nchannels:i?",
@ -744,7 +743,6 @@ ETEXI
.help = "capture audio to a wave file (default frequency=44100 bits=16 channels=2)", .help = "capture audio to a wave file (default frequency=44100 bits=16 channels=2)",
.mhandler.cmd = do_wav_capture, .mhandler.cmd = do_wav_capture,
}, },
#endif
STEXI STEXI
@item wavcapture @var{filename} [@var{frequency} [@var{bits} [@var{channels}]]] @item wavcapture @var{filename} [@var{frequency} [@var{bits} [@var{channels}]]]
@findex wavcapture @findex wavcapture
@ -759,7 +757,6 @@ Defaults:
@end itemize @end itemize
ETEXI ETEXI
#ifdef HAS_AUDIO
{ {
.name = "stopcapture", .name = "stopcapture",
.args_type = "n:i", .args_type = "n:i",
@ -767,7 +764,6 @@ ETEXI
.help = "stop capture", .help = "stop capture",
.mhandler.cmd = do_stop_capture, .mhandler.cmd = do_stop_capture,
}, },
#endif
STEXI STEXI
@item stopcapture @var{index} @item stopcapture @var{index}
@findex stopcapture @findex stopcapture

1
include/sysemu/arch_init.h
View File

@ -30,7 +30,6 @@ void select_soundhw(const char *optarg);
void do_acpitable_option(const QemuOpts *opts); void do_acpitable_option(const QemuOpts *opts);
void do_smbios_option(const char *optarg); void do_smbios_option(const char *optarg);
void cpudef_init(void); void cpudef_init(void);
int audio_available(void);
void audio_init(ISABus *isa_bus, PCIBus *pci_bus); void audio_init(ISABus *isa_bus, PCIBus *pci_bus);
int tcg_available(void); int tcg_available(void);
int kvm_available(void); int kvm_available(void);

2
monitor.c
View File

@ -1862,7 +1862,6 @@ static void do_info_capture(Monitor *mon, const QDict *qdict)
} }
} }
#ifdef HAS_AUDIO
static void do_stop_capture(Monitor *mon, const QDict *qdict) static void do_stop_capture(Monitor *mon, const QDict *qdict)
{ {
int i; int i;
@ -1903,7 +1902,6 @@ static void do_wav_capture(Monitor *mon, const QDict *qdict)
} }
QLIST_INSERT_HEAD (&capture_head, s, entries); QLIST_INSERT_HEAD (&capture_head, s, entries);
} }
#endif
static qemu_acl *find_acl(Monitor *mon, const char *name) static qemu_acl *find_acl(Monitor *mon, const char *name)
{ {

8
vl.c
View File

@ -3232,18 +3232,10 @@ int main(int argc, char **argv, char **envp)
add_device_config(DEV_BT, optarg); add_device_config(DEV_BT, optarg);
break; break;
case QEMU_OPTION_audio_help: case QEMU_OPTION_audio_help:
if (!(audio_available())) {
printf("Option %s not supported for this target\n", popt->name);
exit(1);
}
AUD_help (); AUD_help ();
exit (0); exit (0);
break; break;
case QEMU_OPTION_soundhw: case QEMU_OPTION_soundhw:
if (!(audio_available())) {
printf("Option %s not supported for this target\n", popt->name);
exit(1);
}
select_soundhw (optarg); select_soundhw (optarg);
break; break;
case QEMU_OPTION_h: case QEMU_OPTION_h: