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

audio: remove HAS_AUDIO 



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

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

arch_init.c

+0 −18
Original line number Diff line number Diff line
@@ -887,7 +887,6 @@ SaveVMHandlers savevm_ram_handlers = { 
    .cancel = ram_migration_cancel,

};



#ifdef HAS_AUDIO

struct soundhw {

    const char *name;

    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)

{
@@ -1069,15 +1060,6 @@ void cpudef_init(void) 
#endif

}



int audio_available(void)

{

#ifdef HAS_AUDIO

    return 1;

#else

    return 0;

#endif

}



int tcg_available(void)

{

    return 1;

configure

+0 −8
Original line number Diff line number Diff line
@@ -4457,14 +4457,6 @@ alpha) 
;;

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

  echo "TARGET_GPROF=yes" >> $config_target_mak

  if test "$target_linux_user" = "yes" ; then

hmp-commands.hx

+0 −4
Original line number Diff line number Diff line
@@ -736,7 +736,6 @@ info mice 
@end example

ETEXI



#ifdef HAS_AUDIO

    {

        .name       = "wavcapture",

        .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)",

        .mhandler.cmd = do_wav_capture,

    },

#endif

STEXI

@item wavcapture @var{filename} [@var{frequency} [@var{bits} [@var{channels}]]]

@findex wavcapture
@@ -759,7 +757,6 @@ Defaults: 
@end itemize

ETEXI



#ifdef HAS_AUDIO

    {

        .name       = "stopcapture",

        .args_type  = "n:i",
@@ -767,7 +764,6 @@ ETEXI 
        .help       = "stop capture",

        .mhandler.cmd = do_stop_capture,

    },

#endif

STEXI

@item stopcapture @var{index}

@findex stopcapture

include/sysemu/arch_init.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ void select_soundhw(const char *optarg); 
void do_acpitable_option(const QemuOpts *opts);

void do_smbios_option(const char *optarg);

void cpudef_init(void);

int audio_available(void);

void audio_init(ISABus *isa_bus, PCIBus *pci_bus);

int tcg_available(void);

int kvm_available(void);

monitor.c

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

{

    int i;
@@ -1903,7 +1902,6 @@ static void do_wav_capture(Monitor *mon, const QDict *qdict) 
    }

    QLIST_INSERT_HEAD (&capture_head, s, entries);

}

#endif



static qemu_acl *find_acl(Monitor *mon, const char *name)

{