From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 7 Nov 2013 11:24:41 +0000 (+0100)
Subject: ossaudio: check for oss support in oss_audio_init
X-Git-Tag: v1.7.0-rc1~30^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73204cffe55ce65b3a344afc3da637d67beb8c32;p=thirdparty%2Fqemu.git

ossaudio: check for oss support in oss_audio_init

Check whenever the device path (/dev/dsp by default) exists and qemu is
allowed to access it.  Return NULL if it isn't, so ossaudio will not
be used on systems wihtout oss support (increasinly common on modern
linux systems).

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 007c64115ae..5a737160328 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -849,6 +849,10 @@ static int oss_ctl_in (HWVoiceIn *hw, int cmd, ...)
 
 static void *oss_audio_init (void)
 {
+    if (access(conf.devpath_in, R_OK | W_OK) < 0 ||
+        access(conf.devpath_out, R_OK | W_OK) < 0) {
+        return NULL;
+    }
     return &conf;
 }