From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6yTk-0007lX-KZ for qemu-devel@nongnu.org; Thu, 10 Dec 2015 05:29:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6yTi-0007NB-7w for qemu-devel@nongnu.org; Thu, 10 Dec 2015 05:29:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43033) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6yTi-0007Mu-2W for qemu-devel@nongnu.org; Thu, 10 Dec 2015 05:29:38 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id BB428C0B7A06 for ; Thu, 10 Dec 2015 10:29:37 +0000 (UTC) From: Markus Armbruster Date: Thu, 10 Dec 2015 11:29:31 +0100 Message-Id: <1449743372-17169-12-git-send-email-armbru@redhat.com> In-Reply-To: <1449743372-17169-1-git-send-email-armbru@redhat.com> References: <1449743372-17169-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 11/12] audio: Clean up inappropriate and unreachable use of hw_error() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann audio_init() should not use hw_error(), because dumping CPU registers is unhelpful there, and aborting is wrong, because it can be called called from an audio device's realize() method. The two uses of hw_error() come from commit 0d9acba: * When qemu_new_timer() fails. It couldn't fail back then, and it can't fail now. Drop the unreachable error handling. * When no_audio_driver can't be initialized. It couldn't fail back then, and it can't fail now. Replace the error handling by an assertion. Cc: Gerd Hoffmann Signed-off-by: Markus Armbruster --- audio/audio.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 5be4b15..9b855ed 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1806,9 +1806,6 @@ static void audio_init (void) atexit (audio_atexit); s->ts = timer_new_ns(QEMU_CLOCK_VIRTUAL, audio_timer, s); - if (!s->ts) { - hw_error("Could not create audio timer\n"); - } audio_process_options ("AUDIO", audio_options); @@ -1859,12 +1856,8 @@ static void audio_init (void) if (!done) { done = !audio_driver_init (s, &no_audio_driver); - if (!done) { - hw_error("Could not initialize audio subsystem\n"); - } - else { - dolog ("warning: Using timer based audio emulation\n"); - } + assert(done); + dolog ("warning: Using timer based audio emulation\n"); } if (conf.period.hertz <= 0) { -- 2.4.3