summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorVolker RĂ¼melin <vr_qemu@t-online.de>2022-09-17 15:16:26 +0200
committerGerd Hoffmann <kraxel@redhat.com>2022-09-27 07:32:31 +0200
commit0cbc8bd4694f32687bf47c6da48efa48fac35fd2 (patch)
tree617fd7bd4f6c88630fa32646978e128ae62cef05
parent12f4abf6a245c43d8411577fd400373c85f08c6b (diff)
downloadfocaccia-qemu-0cbc8bd4694f32687bf47c6da48efa48fac35fd2.tar.gz
focaccia-qemu-0cbc8bd4694f32687bf47c6da48efa48fac35fd2.zip
audio: remove abort() in audio_bug()
Commit ab32b78cd1 "audio: Simplify audio_bug() removing old code"
introduced abort() in audio_bug() for regular builds.

audio_bug() was never meant to abort QEMU for the following
reasons.

  - There's code in audio_bug() that expects audio_bug() gets
    called more than once with error condition true. The variable
    'shown' is only 0 on first error.

  - All call sites test the return code of audio_bug(), print
    an error context message and handle the errror.

  - The abort() in audio_bug() enables a class of guest-triggered
    aborts similar to the Launchpad Bug #1910603 at
    https://bugs.launchpad.net/bugs/1910603.

Fixes: ab32b78cd1 "audio: Simplify audio_bug() removing old code"
Buglink: https://bugs.launchpad.net/bugs/1910603
Signed-off-by: Volker RĂ¼melin <vr_qemu@t-online.de>
Message-Id: <20220917131626.7521-2-vr_qemu@t-online.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--audio/audio.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/audio/audio.c b/audio/audio.c
index d96a130559..df6818ed55 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -118,7 +118,6 @@ int audio_bug (const char *funcname, int cond)
             AUD_log (NULL, "I am sorry\n");
         }
         AUD_log (NULL, "Context:\n");
-        abort();
     }
 
     return cond;