qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Gerd Hoffmann" <gerd@kraxel.org>
Subject: [PULL 6/7] audio: Simplify audio_bug() removing old code
Date: Tue, 15 Dec 2020 14:48:25 +0100	[thread overview]
Message-ID: <20201215134826.5504-7-kraxel@redhat.com> (raw)
In-Reply-To: <20201215134826.5504-1-kraxel@redhat.com>

From: Philippe Mathieu-Daudé <philmd@redhat.com>

This code (introduced in commit 1d14ffa97ea, Oct 2005)
is likely unused since years. Time to remove it.  If
the condition is true, simply call abort().

Suggested-by: Gerd Hoffmann <gerd@kraxel.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20201210223506.263709-1-philmd@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 audio/audio.c | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/audio/audio.c b/audio/audio.c
index a21340927033..0fdb808d6a57 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -104,9 +104,6 @@ const struct mixeng_volume nominal_volume = {
 
 static bool legacy_config = true;
 
-#ifdef AUDIO_IS_FLAWLESS_AND_NO_CHECKS_ARE_REQURIED
-#error No its not
-#else
 int audio_bug (const char *funcname, int cond)
 {
     if (cond) {
@@ -119,25 +116,11 @@ int audio_bug (const char *funcname, int cond)
             AUD_log (NULL, "I am sorry\n");
         }
         AUD_log (NULL, "Context:\n");
-
-#if defined AUDIO_BREAKPOINT_ON_BUG
-#  if defined HOST_I386
-#    if defined __GNUC__
-        __asm__ ("int3");
-#    elif defined _MSC_VER
-        _asm _emit 0xcc;
-#    else
-        abort ();
-#    endif
-#  else
-        abort ();
-#  endif
-#endif
+        abort();
     }
 
     return cond;
 }
-#endif
 
 static inline int audio_bits_to_index (int bits)
 {
-- 
2.27.0



  parent reply	other threads:[~2020-12-15 13:56 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-15 13:48 [PULL 0/7] Audio 20201215 patches Gerd Hoffmann
2020-12-15 13:48 ` [PULL 1/7] coreaudio: rename misnamed variable fake_as Gerd Hoffmann
2020-12-15 13:48 ` [PULL 2/7] coreaudio: don't start playback in init routine Gerd Hoffmann
2020-12-15 13:48 ` [PULL 3/7] coreaudio: always stop audio playback on shut down Gerd Hoffmann
2020-12-15 13:48 ` [PULL 4/7] audio: remove unused function audio_is_cleaning_up() Gerd Hoffmann
2020-12-15 13:48 ` [PULL 5/7] cs4231: Get rid of empty property array Gerd Hoffmann
2020-12-15 13:48 ` Gerd Hoffmann [this message]
2020-12-15 13:48 ` [PULL 7/7] audio: add sanity check Gerd Hoffmann
2020-12-15 15:35 ` [PULL 0/7] Audio 20201215 patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201215134826.5504-7-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=gerd@kraxel.org \
    --cc=marcandre.lureau@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).