From patchwork Thu Mar 1 14:28:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 144059 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8F21F1007D2 for ; Fri, 2 Mar 2012 01:51:37 +1100 (EST) Received: from localhost ([::1]:35392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S37Lz-0004Nw-4V for incoming@patchwork.ozlabs.org; Thu, 01 Mar 2012 09:51:35 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S371C-0002RX-0a for qemu-devel@nongnu.org; Thu, 01 Mar 2012 09:30:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S370j-00066G-Hm for qemu-devel@nongnu.org; Thu, 01 Mar 2012 09:30:05 -0500 Received: from mail-ee0-f45.google.com ([74.125.83.45]:54309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S370j-0005kI-7m for qemu-devel@nongnu.org; Thu, 01 Mar 2012 09:29:37 -0500 Received: by mail-ee0-f45.google.com with SMTP id t10so272279eei.4 for ; Thu, 01 Mar 2012 06:29:36 -0800 (PST) Received-SPF: pass (google.com: domain of marcandre.lureau@gmail.com designates 10.213.9.73 as permitted sender) client-ip=10.213.9.73; Authentication-Results: mr.google.com; spf=pass (google.com: domain of marcandre.lureau@gmail.com designates 10.213.9.73 as permitted sender) smtp.mail=marcandre.lureau@gmail.com; dkim=pass header.i=marcandre.lureau@gmail.com Received: from mr.google.com ([10.213.9.73]) by 10.213.9.73 with SMTP id k9mr326870ebk.96.1330612176428 (num_hops = 1); Thu, 01 Mar 2012 06:29:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=fM2n9xg9VGTvoUUr0hlGJ8UirUbd19ezTwCFdtvye0Y=; b=Ba9QYS+elatRXSxHRJy/X9U3Bo55jpJzoJurqjxLB0zOel9VjQ9k3XCdcItq6dXw5m /0cIYPspH4DfNSFlf1CIx4ezchLQO6egBnbDOyJj6CK2GaPor0+fHcPb4ZpNrlzn8A1c mRPFbW0BEgdhIiaK8hgefvR6yxywPDlzzQQQw= Received: by 10.213.9.73 with SMTP id k9mr244826ebk.96.1330612176321; Thu, 01 Mar 2012 06:29:36 -0800 (PST) Received: from localhost (84.216.13.109.rev.sfr.net. [109.13.216.84]) by mx.google.com with ESMTPS id u11sm7923641eeb.1.2012.03.01.06.29.34 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Mar 2012 06:29:35 -0800 (PST) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" To: qemu-devel@nongnu.org Date: Thu, 1 Mar 2012 15:28:07 +0100 Message-Id: <1330612087-1882-12-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1330612087-1882-1-git-send-email-marcandre.lureau@redhat.com> References: <1330612087-1882-1-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1316621468-32171-1-git-send-email-marcandre.lureau@redhat.com> References: <1316621468-32171-1-git-send-email-marcandre.lureau@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.83.45 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kraxel@redhat.com Subject: [Qemu-devel] [PATCH 11/11] Make mixemu mandatory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Without MIXEMU, volume control on the guest doesn't work (except when volume is applied by guest "emulation", in Win7 for example) --- audio/mixeng.c | 6 ------ configure | 8 -------- hw/hda-audio.c | 4 ---- 3 files changed, 0 insertions(+), 18 deletions(-) diff --git a/audio/mixeng.c b/audio/mixeng.c index 5446be6..0b060e3 100644 --- a/audio/mixeng.c +++ b/audio/mixeng.c @@ -336,7 +336,6 @@ void mixeng_clear (struct st_sample *buf, int len) void mixeng_volume (struct st_sample *buf, int len, struct mixeng_volume *vol) { -#ifdef CONFIG_MIXEMU if (vol->mute) { mixeng_clear (buf, len); return; @@ -352,9 +351,4 @@ void mixeng_volume (struct st_sample *buf, int len, struct mixeng_volume *vol) #endif buf += 1; } -#else - (void) buf; - (void) len; - (void) vol; -#endif } diff --git a/configure b/configure index 938c2d2..7bc13d9 100755 --- a/configure +++ b/configure @@ -175,7 +175,6 @@ darwin_user="no" bsd_user="no" guest_base="" uname_release="" -mixemu="no" aix="no" blobs="yes" pkgversion="" @@ -762,8 +761,6 @@ for opt do ;; --enable-nptl) nptl="yes" ;; - --enable-mixemu) mixemu="yes" - ;; --disable-linux-aio) linux_aio="no" ;; --enable-linux-aio) linux_aio="yes" @@ -1020,7 +1017,6 @@ echo " --audio-card-list=LIST set list of emulated audio cards [$audio_card_l echo " Available cards: $audio_possible_cards" echo " --block-drv-whitelist=L set block driver whitelist" echo " (affects only QEMU, not qemu-img)" -echo " --enable-mixemu enable mixer emulation" echo " --disable-xen disable xen backend driver support" echo " --enable-xen enable xen backend driver support" echo " --disable-brlapi disable BrlAPI" @@ -2899,7 +2895,6 @@ echo "mingw32 support $mingw32" echo "Audio drivers $audio_drv_list" echo "Extra audio cards $audio_card_list" echo "Block whitelist $block_drv_whitelist" -echo "Mixer emulation $mixemu" echo "VirtFS support $virtfs" echo "VNC support $vnc" if test "$vnc" = "yes" ; then @@ -3062,9 +3057,6 @@ if test "$audio_win_int" = "yes" ; then echo "CONFIG_AUDIO_WIN_INT=y" >> $config_host_mak fi echo "CONFIG_BDRV_WHITELIST=$block_drv_whitelist" >> $config_host_mak -if test "$mixemu" = "yes" ; then - echo "CONFIG_MIXEMU=y" >> $config_host_mak -fi if test "$vnc" = "yes" ; then echo "CONFIG_VNC=y" >> $config_host_mak fi diff --git a/hw/hda-audio.c b/hw/hda-audio.c index 8995519..75f1402 100644 --- a/hw/hda-audio.c +++ b/hw/hda-audio.c @@ -121,15 +121,11 @@ static void hda_codec_parse_fmt(uint32_t format, struct audsettings *as) #define QEMU_HDA_AMP_NONE (0) #define QEMU_HDA_AMP_STEPS 0x4a -#ifdef CONFIG_MIXEMU #define QEMU_HDA_AMP_CAPS \ (AC_AMPCAP_MUTE | \ (QEMU_HDA_AMP_STEPS << AC_AMPCAP_OFFSET_SHIFT) | \ (QEMU_HDA_AMP_STEPS << AC_AMPCAP_NUM_STEPS_SHIFT) | \ (3 << AC_AMPCAP_STEP_SIZE_SHIFT)) -#else -#define QEMU_HDA_AMP_CAPS QEMU_HDA_AMP_NONE -#endif /* common: audio output widget */ static const desc_param common_params_audio_dac[] = {