From patchwork Fri Jul 20 07:17:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 172147 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 E52DF2C0376 for ; Fri, 20 Jul 2012 17:17:35 +1000 (EST) Received: from localhost ([::1]:44430 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ss7Sv-0002OT-B8 for incoming@patchwork.ozlabs.org; Fri, 20 Jul 2012 03:17:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ss7So-0002OH-JW for qemu-devel@nongnu.org; Fri, 20 Jul 2012 03:17:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ss7Sm-00023e-PP for qemu-devel@nongnu.org; Fri, 20 Jul 2012 03:17:26 -0400 Received: from mout.web.de ([212.227.15.4]:60850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ss7Sm-00023Y-FW for qemu-devel@nongnu.org; Fri, 20 Jul 2012 03:17:24 -0400 Received: from mchn199C.mchp.siemens.de ([95.157.56.37]) by smtp.web.de (mrweb003) with ESMTPSA (Nemesis) id 0MMmwZ-1SviN32klL-0082Bm; Fri, 20 Jul 2012 09:17:23 +0200 Message-ID: <50090601.40800@web.de> Date: Fri, 20 Jul 2012 09:17:21 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: malc References: <50082E7F.7030800@siemens.com> <5008980C.60809@codemonkey.ws> <50090269.7090604@web.de> In-Reply-To: <50090269.7090604@web.de> X-Enigmail-Version: 1.4.3 X-Provags-ID: V02:K0:NgW/vrAshAhOo1pUQRHTjpo+4q5Xbh5qOtVyHiuWHrl SgEt3cU6I7A5x2iYnZ7lMSl7zU6/9N6/3NDNcsJ+NU0KJoauJ6 0u1IUrOkOtRqOk+5C0QYYbbkHeYSbAM0xZfp1KnCv99rsYRDx7 puI7rYiJ4fyp27caY6An+s8JxvghL/hIpavGhk+7g6AJYtfr7I XMoX19vQllroKsSsSU6IQ== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.15.4 Cc: qemu-devel , Anthony Liguori Subject: [Qemu-devel] [PATCH] audio: Make pcspk card selectable again 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 From: Jan Kiszka Since we moved pcspk into hwlib, CONFIG_PCSPK is no longer defined per target. Therefore, statically built soundhw array in arch_init.c stopped including this card. Work around this by re-adding this define to config-target.mak. Long-term, a dynamic creation of this soundhw list will be necessary. Signed-off-by: Jan Kiszka --- configure | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 106209a..77b5096 100755 --- a/configure +++ b/configure @@ -3818,6 +3818,11 @@ if test "$target_bsd_user" = "yes" ; then echo "CONFIG_BSD_USER=y" >> $config_target_mak fi +# the static way of configuring available audio cards requires this workaround +if test "$target_user_only" != "yes" && grep -q CONFIG_PCSPK $source_path/default-configs/$target.mak; then + echo "CONFIG_PCSPK=y" >> $config_target_mak +fi + # generate QEMU_CFLAGS/LDFLAGS for targets cflags=""