Blame SOURCES/kvm-audio-remove-CONFIG_MIXEMU-configure-option.patch

218e99
From 2254d0ce9d463c8a72ec9b1e21a9310231764c3a Mon Sep 17 00:00:00 2001
218e99
From: Bandan Das <bsd@redhat.com>
218e99
Date: Tue, 15 Oct 2013 17:11:00 +0200
218e99
Subject: [PATCH 23/25] audio: remove CONFIG_MIXEMU configure option
218e99
218e99
RH-Author: Bandan Das <bsd@redhat.com>
218e99
Message-id: <1381857067-9399-4-git-send-email-bsd@redhat.com>
218e99
Patchwork-id: 54951
218e99
O-Subject: [PATCH RHEL-7 qemu-kvm v3 3/5] audio: remove CONFIG_MIXEMU configure option
218e99
Bugzilla: 954195
218e99
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
218e99
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
218e99
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
218e99
218e99
Signed-off-by: Bandan Das <bsd@redhat.com>
218e99
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
218e99
(cherry picked from commit 19b0dfc19c0d911c322a03899806c59bc2f593c9)
218e99
218e99
Conflicts:
218e99
	configure
218e99
---
218e99
 audio/mixeng.c       |  6 ------
218e99
 configure            |  8 --------
218e99
 hw/audio/hda-codec.c | 30 ------------------------------
218e99
 3 files changed, 44 deletions(-)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 audio/mixeng.c       |    6 ------
218e99
 configure            |    8 --------
218e99
 hw/audio/hda-codec.c |   30 ------------------------------
218e99
 3 files changed, 0 insertions(+), 44 deletions(-)
218e99
218e99
diff --git a/audio/mixeng.c b/audio/mixeng.c
218e99
index 02a9d9f..0e4976f 100644
218e99
--- a/audio/mixeng.c
218e99
+++ b/audio/mixeng.c
218e99
@@ -348,7 +348,6 @@ void mixeng_clear (struct st_sample *buf, int len)
218e99
 
218e99
 void mixeng_volume (struct st_sample *buf, int len, struct mixeng_volume *vol)
218e99
 {
218e99
-#ifdef CONFIG_MIXEMU
218e99
     if (vol->mute) {
218e99
         mixeng_clear (buf, len);
218e99
         return;
218e99
@@ -364,9 +363,4 @@ void mixeng_volume (struct st_sample *buf, int len, struct mixeng_volume *vol)
218e99
 #endif
218e99
         buf += 1;
218e99
     }
218e99
-#else
218e99
-    (void) buf;
218e99
-    (void) len;
218e99
-    (void) vol;
218e99
-#endif
218e99
 }
218e99
diff --git a/configure b/configure
218e99
index 02e483d..4d1bc44 100755
218e99
--- a/configure
218e99
+++ b/configure
218e99
@@ -215,7 +215,6 @@ linux_user="no"
218e99
 bsd_user="no"
218e99
 guest_base="yes"
218e99
 uname_release=""
218e99
-mixemu="no"
218e99
 aix="no"
218e99
 blobs="yes"
218e99
 pkgversion=""
218e99
@@ -851,8 +850,6 @@ for opt do
218e99
   ;;
218e99
   --enable-nptl) nptl="yes"
218e99
   ;;
218e99
-  --enable-mixemu) mixemu="yes"
218e99
-  ;;
218e99
   --disable-linux-aio) linux_aio="no"
218e99
   ;;
218e99
   --enable-linux-aio) linux_aio="yes"
218e99
@@ -1115,7 +1112,6 @@ echo "                           (affects only QEMU, not qemu-img)"
218e99
 echo "  --block-drv-ro-whitelist=L"
218e99
 echo "                           set block driver read-only whitelist"
218e99
 echo "                           (affects only QEMU, not qemu-img)"
218e99
-echo "  --enable-mixemu          enable mixer emulation"
218e99
 echo "  --disable-xen            disable xen backend driver support"
218e99
 echo "  --enable-xen             enable xen backend driver support"
218e99
 echo "  --disable-xen-pci-passthrough"
218e99
@@ -3537,7 +3533,6 @@ echo "mingw32 support   $mingw32"
218e99
 echo "Audio drivers     $audio_drv_list"
218e99
 echo "Block whitelist (rw) $block_drv_rw_whitelist"
218e99
 echo "Block whitelist (ro) $block_drv_ro_whitelist"
218e99
-echo "Mixer emulation   $mixemu"
218e99
 echo "VirtFS support    $virtfs"
218e99
 echo "VNC support       $vnc"
218e99
 if test "$vnc" = "yes" ; then
218e99
@@ -3719,9 +3714,6 @@ if test "$audio_win_int" = "yes" ; then
218e99
 fi
218e99
 echo "CONFIG_BDRV_RW_WHITELIST=$block_drv_rw_whitelist" >> $config_host_mak
218e99
 echo "CONFIG_BDRV_RO_WHITELIST=$block_drv_ro_whitelist" >> $config_host_mak
218e99
-if test "$mixemu" = "yes" ; then
218e99
-  echo "CONFIG_MIXEMU=y" >> $config_host_mak
218e99
-fi
218e99
 if test "$vnc" = "yes" ; then
218e99
   echo "CONFIG_VNC=y" >> $config_host_mak
218e99
 fi
218e99
diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
218e99
index 3217d90..94c472c 100644
218e99
--- a/hw/audio/hda-codec.c
218e99
+++ b/hw/audio/hda-codec.c
218e99
@@ -118,11 +118,9 @@ static void hda_codec_parse_fmt(uint32_t format, struct audsettings *as)
218e99
 #define QEMU_HDA_AMP_NONE    (0)
218e99
 #define QEMU_HDA_AMP_STEPS   0x4a
218e99
 
218e99
-#ifdef CONFIG_MIXEMU
218e99
 #define   PARAM mixemu
218e99
 #define   HDA_MIXER
218e99
 #include "hda-codec-common.h"
218e99
-#endif
218e99
 
218e99
 #define   PARAM nomixemu
218e99
 #include  "hda-codec-common.h"
218e99
@@ -594,11 +592,7 @@ static const VMStateDescription vmstate_hda_audio = {
218e99
 
218e99
 static Property hda_audio_properties[] = {
218e99
     DEFINE_PROP_UINT32("debug", HDAAudioState, debug,   0),
218e99
-#ifdef CONFIG_MIXEMU
218e99
     DEFINE_PROP_BOOL("mixer", HDAAudioState, mixer,  true),
218e99
-#else
218e99
-    DEFINE_PROP_BOOL("mixer", HDAAudioState, mixer, false),
218e99
-#endif
218e99
     DEFINE_PROP_END_OF_LIST(),
218e99
 };
218e99
 
218e99
@@ -609,15 +603,7 @@ static int hda_audio_init_output(HDACodecDevice *hda)
218e99
     if (!a->mixer) {
218e99
         return hda_audio_init(hda, &output_nomixemu);
218e99
     } else {
218e99
-
218e99
-#ifdef CONFIG_MIXEMU
218e99
         return hda_audio_init(hda, &output_mixemu);
218e99
-#else
218e99
-        fprintf(stderr, "ERROR: "
218e99
-                "hda-codec : Mixer emulation has not been compiled in!\n");
218e99
-        return -1;
218e99
-#endif
218e99
-
218e99
     }
218e99
 }
218e99
 
218e99
@@ -628,15 +614,7 @@ static int hda_audio_init_duplex(HDACodecDevice *hda)
218e99
     if (!a->mixer) {
218e99
         return hda_audio_init(hda, &duplex_nomixemu);
218e99
     } else {
218e99
-
218e99
-#ifdef CONFIG_MIXEMU
218e99
         return hda_audio_init(hda, &duplex_mixemu);
218e99
-#else
218e99
-        fprintf(stderr, "ERROR: "
218e99
-                "hda-codec : Mixer emulation has not been compiled in!\n");
218e99
-        return -1;
218e99
-#endif
218e99
-
218e99
     }
218e99
 }
218e99
 
218e99
@@ -647,15 +625,7 @@ static int hda_audio_init_micro(HDACodecDevice *hda)
218e99
     if (!a->mixer) {
218e99
         return hda_audio_init(hda, µ_nomixemu);
218e99
     } else {
218e99
-
218e99
-#ifdef CONFIG_MIXEMU
218e99
         return hda_audio_init(hda, µ_mixemu);
218e99
-#else
218e99
-        fprintf(stderr, "ERROR: "
218e99
-                "hda-codec : Mixer emulation has not been compiled in!\n");
218e99
-        return -1;
218e99
-#endif
218e99
-
218e99
     }
218e99
 }
218e99
 
218e99
-- 
218e99
1.7.1
218e99