From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEA37C43217 for ; Thu, 7 Oct 2021 20:57:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D7BE60F38 for ; Thu, 7 Oct 2021 20:57:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4D7BE60F38 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:41302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYaSB-0007ep-AJ for qemu-devel@archiver.kernel.org; Thu, 07 Oct 2021 16:57:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYaDq-00066p-F8 for qemu-devel@nongnu.org; Thu, 07 Oct 2021 16:42:36 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:37815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYaDo-0006PC-MD for qemu-devel@nongnu.org; Thu, 07 Oct 2021 16:42:34 -0400 Received: by mail-wr1-x435.google.com with SMTP id e12so22869103wra.4 for ; Thu, 07 Oct 2021 13:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=9fiwBtJIUpYRfkM3frG/REtzgYYtFqPLKzrfgn7vKZc=; b=WRwlwBjkURcSsPG/vV7bKsqo7R9W4urg8W7TUqz+p8npTyKlxAvTqSHsv7zWJ+2jIr ulSJuPNksgcD5U0Ur5UuQodMZCRbEev5XABzs/8u9p5CnvSMRfbfYHrlTbF5eH8K7bGI IV0WaXHzTPfZnnA5UciEeZX/xbbkqQmANNBpLxt0YFWAgX2JVVNrhUg9mb0OjNEAfkPU Xnov2+fzpEbAP393XS9n02ZcdBcjAu1fW9SPuEotWewu8PO7J7sCOzmNt8sRlX2fkTZj C9u88JM9q7px9jWVc9mJP7qFbO2huCzrpQKF/Ka8V+GsqGwJKfNlNFGqukCpgbbVyfsl hYCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=9fiwBtJIUpYRfkM3frG/REtzgYYtFqPLKzrfgn7vKZc=; b=gf+DlvdwIIPPYE2oLGw4CUhTroTwKe3/P5OF7htu7TGRaHtYM8h9a+jjpthOZn9PEb GjFPsHfqvgFnxukUGpKOhc2rhnude8oRPEGFKMVHG4Drk9NpQ8W1pwVRQG8GAEx1G273 MTWDbHKkTv+k71cu9UF6qbaa6x2qi14yvM5JgDNPoZ8n7uKfHe+AS1qn9D/mvmKwrF7t iE8D7sex6Ic23Q+QBqbR9mbGulIq2Pfm6cm27JFdQ5gPez/yTzCuqrmPCXvfev1OdShR 5HEYxkfXs2lUexdZ+Y+QVFb4zCR5x/i2vkDLWDNLICAiqxTrSYrvzGgMpHl0KiFu08Y4 QEAg== X-Gm-Message-State: AOAM53036uOpNZFyYjtlSGfYzk6rBfo5tPcv7wOov9Iz504kMaHNb0BG PAFu0HZKqv+3o1RBxaAayJvd50Pj7NsMv9xj8CU= X-Google-Smtp-Source: ABdhPJwCC9S4xQL6hZhQ+5P2SrIDvmw1fmX2GtO6Xo+iKPn8l8Off7f6Mrq2IR1DTmJSchDETWmuVteWNW5TtKXYaT8= X-Received: by 2002:adf:a209:: with SMTP id p9mr8103309wra.70.1633639351530; Thu, 07 Oct 2021 13:42:31 -0700 (PDT) MIME-Version: 1.0 References: <20211007130630.632028-1-pbonzini@redhat.com> <20211007130630.632028-3-pbonzini@redhat.com> In-Reply-To: <20211007130630.632028-3-pbonzini@redhat.com> From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Fri, 8 Oct 2021 00:42:19 +0400 Message-ID: Subject: Re: [PATCH 02/24] audio: remove CONFIG_AUDIO_WIN_INT To: Paolo Bonzini Content-Type: multipart/alternative; boundary="0000000000003d3c7c05cdc94d34" Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=marcandre.lureau@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?Q?Volker_R=C3=BCmelin?= , QEMU , Gerd Hoffman Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --0000000000003d3c7c05cdc94d34 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Oct 7, 2021 at 5:09 PM Paolo Bonzini wrote: > Ever since winwaveaudio was removed in 2015, CONFIG_AUDIO_WIN_INT > is only set if dsound is in use, so use CONFIG_AUDIO_DSOUND directly. > > Cc: Gerd Hoffman > Cc: Volker R=C3=BCmelin > Signed-off-by: Paolo Bonzini > Reviewed-by: Marc-Andr=C3=A9 Lureau --- > audio/meson.build | 4 ++-- > configure | 5 ----- > 2 files changed, 2 insertions(+), 7 deletions(-) > > diff --git a/audio/meson.build b/audio/meson.build > index 7d53b0f920..9a95c58f18 100644 > --- a/audio/meson.build > +++ b/audio/meson.build > @@ -8,8 +8,8 @@ softmmu_ss.add(files( > )) > > softmmu_ss.add(when: [coreaudio, 'CONFIG_AUDIO_COREAUDIO'], if_true: > files('coreaudio.c')) > -softmmu_ss.add(when: [dsound, 'CONFIG_AUDIO_DSOUND'], if_true: > files('dsoundaudio.c')) > -softmmu_ss.add(when: ['CONFIG_AUDIO_WIN_INT'], if_true: > files('audio_win_int.c')) > +softmmu_ss.add(when: [dsound, 'CONFIG_AUDIO_DSOUND'], > + if_true: files('dsoundaudio.c', 'audio_win_int.c')) > > audio_modules =3D {} > foreach m : [ > diff --git a/configure b/configure > index ab6bc0c994..6a6273ce7b 100755 > --- a/configure > +++ b/configure > @@ -245,7 +245,6 @@ block_drv_rw_whitelist=3D"" > block_drv_ro_whitelist=3D"" > block_drv_whitelist_tools=3D"no" > host_cc=3D"cc" > -audio_win_int=3D"" > libs_qga=3D"" > debug_info=3D"yes" > lto=3D"false" > @@ -3075,7 +3074,6 @@ for drv in $audio_drv_list; do > > dsound) > dsound_libs=3D"-lole32 -ldxguid" > - audio_win_int=3D"yes" > ;; > > oss) > @@ -4560,9 +4558,6 @@ if test "$libjack" =3D "yes" ; then > echo "CONFIG_LIBJACK=3Dy" >> $config_host_mak > fi > echo "JACK_LIBS=3D$jack_libs" >> $config_host_mak > -if test "$audio_win_int" =3D "yes" ; then > - echo "CONFIG_AUDIO_WIN_INT=3Dy" >> $config_host_mak > -fi > echo "CONFIG_BDRV_RW_WHITELIST=3D$block_drv_rw_whitelist" >> > $config_host_mak > echo "CONFIG_BDRV_RO_WHITELIST=3D$block_drv_ro_whitelist" >> > $config_host_mak > if test "$block_drv_whitelist_tools" =3D "yes" ; then > -- > 2.31.1 > > > > --=20 Marc-Andr=C3=A9 Lureau --0000000000003d3c7c05cdc94d34 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Oct 7, 2021 at 5:09 PM Paolo = Bonzini <pbonzi= ni@redhat.com> wrote:
Ever since winwaveaudio was removed in 2015, CONFIG_AUDIO_WIN_= INT
is only set if dsound is in use, so use CONFIG_AUDIO_DSOUND directly.

Cc: Gerd Hoffman <kraxel@redhat.com>
Cc: Volker R=C3=BCmelin <vr_qemu@t-online.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

<= div>Reviewed-by: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>
=

---
=C2=A0audio/meson.build | 4 ++--
=C2=A0configure=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 5 -----
=C2=A02 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/audio/meson.build b/audio/meson.build
index 7d53b0f920..9a95c58f18 100644
--- a/audio/meson.build
+++ b/audio/meson.build
@@ -8,8 +8,8 @@ softmmu_ss.add(files(
=C2=A0))

=C2=A0softmmu_ss.add(when: [coreaudio, 'CONFIG_AUDIO_COREAUDIO'], i= f_true: files('coreaudio.c'))
-softmmu_ss.add(when: [dsound, 'CONFIG_AUDIO_DSOUND'], if_true: fil= es('dsoundaudio.c'))
-softmmu_ss.add(when: ['CONFIG_AUDIO_WIN_INT'], if_true: files('= ;audio_win_int.c'))
+softmmu_ss.add(when: [dsound, 'CONFIG_AUDIO_DSOUND'],
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if_true: files('= ;dsoundaudio.c', 'audio_win_int.c'))

=C2=A0audio_modules =3D {}
=C2=A0foreach m : [
diff --git a/configure b/configure
index ab6bc0c994..6a6273ce7b 100755
--- a/configure
+++ b/configure
@@ -245,7 +245,6 @@ block_drv_rw_whitelist=3D""
=C2=A0block_drv_ro_whitelist=3D""
=C2=A0block_drv_whitelist_tools=3D"no"
=C2=A0host_cc=3D"cc"
-audio_win_int=3D""
=C2=A0libs_qga=3D""
=C2=A0debug_info=3D"yes"
=C2=A0lto=3D"false"
@@ -3075,7 +3074,6 @@ for drv in $audio_drv_list; do

=C2=A0 =C2=A0 =C2=A0dsound)
=C2=A0 =C2=A0 =C2=A0 =C2=A0dsound_libs=3D"-lole32 -ldxguid"
-=C2=A0 =C2=A0 =C2=A0 audio_win_int=3D"yes"
=C2=A0 =C2=A0 =C2=A0;;

=C2=A0 =C2=A0 =C2=A0oss)
@@ -4560,9 +4558,6 @@ if test "$libjack" =3D "yes" ; th= en
=C2=A0 =C2=A0 =C2=A0echo "CONFIG_LIBJACK=3Dy" >> $config_ho= st_mak
=C2=A0fi
=C2=A0echo "JACK_LIBS=3D$jack_libs" >> $config_host_mak
-if test "$audio_win_int" =3D "yes" ; then
-=C2=A0 echo "CONFIG_AUDIO_WIN_INT=3Dy" >> $config_host_mak=
-fi
=C2=A0echo "CONFIG_BDRV_RW_WHITELIST=3D$block_drv_rw_whitelist" &= gt;> $config_host_mak
=C2=A0echo "CONFIG_BDRV_RO_WHITELIST=3D$block_drv_ro_whitelist" &= gt;> $config_host_mak
=C2=A0if test "$block_drv_whitelist_tools" =3D "yes" ; = then
--
2.31.1





--
Marc-Andr= =C3=A9 Lureau
--0000000000003d3c7c05cdc94d34--