From patchwork Tue Apr 7 09:22:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 11477765 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 305F515AB for ; Tue, 7 Apr 2020 09:23:31 +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 06B26206C0 for ; Tue, 7 Apr 2020 09:23:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YZaMIwLb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 06B26206C0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:43830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLkSA-0004Ud-5W for patchwork-qemu-devel@patchwork.kernel.org; Tue, 07 Apr 2020 05:23:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33177) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLkR7-0002OU-Db for qemu-devel@nongnu.org; Tue, 07 Apr 2020 05:22:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLkR5-0000h5-84 for qemu-devel@nongnu.org; Tue, 07 Apr 2020 05:22:25 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:37856 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jLkR3-0000dt-OK for qemu-devel@nongnu.org; Tue, 07 Apr 2020 05:22:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586251339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NM3v1M7rRjav14bilItKEzeKQnAuvPJUdvO24hXCyXs=; b=YZaMIwLbtEe45EwixOEtwA8DRe6ORnko5SMiBp4WbPH5cBMrN8XOlvAgnNM2p7mZGO63tp kXlw8XLtwfLXzAaJXQTNsMe4gd4ZJhweux0Ni1AeDdV16buCATgTXYNiGuSzQ2djjMcDgt Zqfw6qxbs/Shwz1xFssT4uWHFAFE9VU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-295-z5b4TgFlMpmWaR7RgW4ACw-1; Tue, 07 Apr 2020 05:22:15 -0400 X-MC-Unique: z5b4TgFlMpmWaR7RgW4ACw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8A8378017CE; Tue, 7 Apr 2020 09:22:14 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-60.ams2.redhat.com [10.36.113.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CA145C1BB; Tue, 7 Apr 2020 09:22:08 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 15DEF17511; Tue, 7 Apr 2020 11:22:07 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/4] dsoundaudio: fix "Could not lock capture buffer" warning Date: Tue, 7 Apr 2020 11:22:04 +0200 Message-Id: <20200407092207.6079-3-kraxel@redhat.com> In-Reply-To: <20200407092207.6079-1-kraxel@redhat.com> References: <20200407092207.6079-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Volker Rümelin IDirectSoundCaptureBuffer_Lock() fails on Windows when called with len = 0. Return early from dsound_get_buffer_in() in this case. To reproduce the warning start a linux guest. In the guest start Audacity and you will see a lot of "Could not lock capture buffer" warnings. Signed-off-by: Volker Rümelin Message-id: 20200405075017.9901-2-vr_qemu@t-online.de Signed-off-by: Gerd Hoffmann --- audio/dsoundaudio.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c index 9e621c889954..a08d519cae6a 100644 --- a/audio/dsoundaudio.c +++ b/audio/dsoundaudio.c @@ -542,6 +542,11 @@ static void *dsound_get_buffer_in(HWVoiceIn *hw, size_t *size) req_size = audio_ring_dist(cpos, hw->pos_emul, hw->size_emul); req_size = MIN(req_size, hw->size_emul - hw->pos_emul); + if (req_size == 0) { + *size = 0; + return NULL; + } + err = dsound_lock_in(dscb, &hw->info, hw->pos_emul, req_size, &ret, NULL, &act_size, NULL, false, ds->s); if (err) {