From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZxMo-0001HS-Dj for qemu-devel@nongnu.org; Tue, 26 Jan 2010 21:10:50 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZxMk-0001HB-NE for qemu-devel@nongnu.org; Tue, 26 Jan 2010 21:10:50 -0500 Received: from [199.232.76.173] (port=59944 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZxMk-0001H8-HP for qemu-devel@nongnu.org; Tue, 26 Jan 2010 21:10:46 -0500 Received: from mail-iw0-f188.google.com ([209.85.223.188]:42042) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZxMk-0000lT-0V for qemu-devel@nongnu.org; Tue, 26 Jan 2010 21:10:46 -0500 Received: by mail-iw0-f188.google.com with SMTP id 26so5639882iwn.14 for ; Tue, 26 Jan 2010 18:10:45 -0800 (PST) Message-ID: <4B5FA0A3.30302@codemonkey.ws> Date: Tue, 26 Jan 2010 20:10:43 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH 6/6] fix audio_bug related failures References: <1264547685-21129-1-git-send-email-pbonzini@redhat.com> <1264547685-21129-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1264547685-21129-7-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org What did clang complain about? It's not obvious to me. Regards, Anthony Liguori On 01/26/2010 05:14 PM, Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini > --- > audio/audio.c | 44 ++++++++++++++++++++------------------------ > audio/audio_int.h | 3 ++- > 2 files changed, 22 insertions(+), 25 deletions(-) > > diff --git a/audio/audio.c b/audio/audio.c > index 2a20e5b..7fce46c 100644 > --- a/audio/audio.c > +++ b/audio/audio.c > @@ -118,42 +118,38 @@ struct mixeng_volume nominal_volume = { > static void audio_print_options (const char *prefix, > struct audio_option *opt); > > -int audio_bug (const char *funcname, int cond) > +void audio_bug_found (const char *funcname) > { > - if (cond) { > - static int shown; > - > - AUD_log (NULL, "A bug was just triggered in %s\n", funcname); > - if (!shown) { > - struct audio_driver *d; > - > - shown = 1; > - AUD_log (NULL, "Save all your work and restart without audio\n"); > - AUD_log (NULL, "Please send bug report to av1474@comtv.ru\n"); > - AUD_log (NULL, "I am sorry\n"); > - d = glob_audio_state.drv; > - if (d) { > - audio_print_options (d->name, d->options); > - } > + static int shown; > + > + AUD_log (NULL, "A bug was just triggered in %s\n", funcname); > + if (!shown) { > + struct audio_driver *d; > + > + shown = 1; > + AUD_log (NULL, "Save all your work and restart without audio\n"); > + AUD_log (NULL, "Please send bug report to av1474@comtv.ru\n"); > + AUD_log (NULL, "I am sorry\n"); > + d = glob_audio_state.drv; > + if (d) { > + audio_print_options (d->name, d->options); > } > - AUD_log (NULL, "Context:\n"); > + } > + AUD_log (NULL, "Context:\n"); > > #if defined AUDIO_BREAKPOINT_ON_BUG > # if defined HOST_I386 > # if defined __GNUC__ > - __asm__ ("int3"); > + __asm__ ("int3"); > # elif defined _MSC_VER > - _asm _emit 0xcc; > + _asm _emit 0xcc; > # else > - abort (); > + abort (); > # endif > # else > - abort (); > + abort (); > # endif > #endif > - } > - > - return cond; > } > #endif > > diff --git a/audio/audio_int.h b/audio/audio_int.h > index 06e313f..4244615 100644 > --- a/audio/audio_int.h > +++ b/audio/audio_int.h > @@ -223,7 +223,8 @@ int audio_pcm_sw_read (SWVoiceIn *sw, void *buf, int len); > int audio_pcm_hw_clip_out (HWVoiceOut *hw, void *pcm_buf, > int live, int pending); > > -int audio_bug (const char *funcname, int cond); > +#define audio_bug(funcname, cond) ((cond) ? audio_bug_found (funcname), 1 : 0) > +void audio_bug_found (const char *funcname); > void *audio_calloc (const char *funcname, int nmemb, size_t size); > > void audio_run (const char *msg); >