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 X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7A16C3A5A1 for ; Sun, 25 Aug 2019 19:00:33 +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 93978206E0 for ; Sun, 25 Aug 2019 19:00:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SNfnfncd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 93978206E0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i1xke-0000Jk-N6 for qemu-devel@archiver.kernel.org; Sun, 25 Aug 2019 15:00:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57913) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i1xXW-0001SU-Mh for qemu-devel@nongnu.org; Sun, 25 Aug 2019 14:46:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i1xXV-0004x3-Jp for qemu-devel@nongnu.org; Sun, 25 Aug 2019 14:46:58 -0400 Received: from mail-qt1-x843.google.com ([2607:f8b0:4864:20::843]:45179) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i1xXV-0004wp-FH for qemu-devel@nongnu.org; Sun, 25 Aug 2019 14:46:57 -0400 Received: by mail-qt1-x843.google.com with SMTP id k13so15899108qtm.12 for ; Sun, 25 Aug 2019 11:46:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oup2xTgLOuc5pQrwdWdp2p8hzuUK4Bunh8yLJZfvb+Q=; b=SNfnfncdOW66zji8f1KafYc+tq1eD81p6J8+EbVs9qn7SN3lBFCHvvXc6GQ3mowXwn lZPWcW1gXUWVm1/wREp9iQxbyECcd9q+ug+79inKE765n2vunRyrFRZES/JJYJS7VFoQ mApqUoqyNNE4EvTNGjaCHYow6Wfa7PShwB2gZ3zhw7aeawTmixk7wMSRBBKR7mGZY2uG fCCnNVH67CYMWzU6Nya9FEtKJK8axAteSWHUn11VhpiVyFPpM6mN5au92J5gVRkX/w0/ 7AIRkFQpaOKWzb+CPQGDKcdacwBqBIbyh/QpqWgHujY8HkY+yPEN6JsG8xbkGZRjvMZ4 zfvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oup2xTgLOuc5pQrwdWdp2p8hzuUK4Bunh8yLJZfvb+Q=; b=fgUUxLT6xB9wvEVF6JFCfcpbtowEGu6pvcWQaDgZkEsqmvNEem90r4YkzsV3x289n1 WQAeS0l1iwCMnrdP629z08eWxBlxiw14I9B8jGOs03b8gifsItaxuHH+TVYbzBo2j+E4 gaqQ8LfLSM+A4jRobWZcwUL0TsoaRVdX/DUoMMnvXslyxePT4HpjBAJHIwDwH3cx9WGC k3NbiXc5aTm+KScpry5vNZ4S9ywNUShWH+W9Cy4MJ7/OJ8scvW4dNYRwuDUEdn69PGmz qCHxTe8i7UyWuZ+V0o5W4i/rQpKOp0MimJhqQFSSWedrIJ18masLE3916plsGEw73bBw oJNw== X-Gm-Message-State: APjAAAWj2fUBY56Q13rVjhxXwK7N/hsAAHEw0OQT72o9sOJ+LIhuO8Zu dQdVgDej7w4faGewrNVcn+Ca3FyHwDk= X-Google-Smtp-Source: APXvYqyiyXQjvY+7teULzdtLqxxI1Lf6fPFe6LYTHfAViKosHMUezI5bmVWhn0kdq0PvJKUYZWYknA== X-Received: by 2002:a0c:b251:: with SMTP id k17mr12658518qve.132.1566758816916; Sun, 25 Aug 2019 11:46:56 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-61b1-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:61b1::5]) by smtp.gmail.com with ESMTPSA id d3sm5348870qtq.32.2019.08.25.11.46.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Aug 2019 11:46:56 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Sun, 25 Aug 2019 20:46:25 +0200 Message-Id: X-Mailer: git-send-email 2.22.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::843 Subject: [Qemu-devel] [PATCH 23/25] usb-audio: do not count on avail bytes actually available 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: Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Archived-At: List-Archive: This assumption is no longer true when mixeng is turned off. Signed-off-by: Kővágó, Zoltán --- hw/usb/dev-audio.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index ae42e5a2f1..74c99b1f12 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -319,30 +319,31 @@ static int streambuf_put(struct streambuf *buf, USBPacket *p) { uint32_t free = buf->size - (buf->prod - buf->cons); - if (!free) { + if (free < USBAUDIO_PACKET_SIZE) { return 0; } if (p->iov.size != USBAUDIO_PACKET_SIZE) { return 0; } - assert(free >= USBAUDIO_PACKET_SIZE); + usb_packet_copy(p, buf->data + (buf->prod % buf->size), USBAUDIO_PACKET_SIZE); buf->prod += USBAUDIO_PACKET_SIZE; return USBAUDIO_PACKET_SIZE; } -static uint8_t *streambuf_get(struct streambuf *buf) +static uint8_t *streambuf_get(struct streambuf *buf, size_t *len) { uint32_t used = buf->prod - buf->cons; uint8_t *data; if (!used) { + *len = 0; return NULL; } - assert(used >= USBAUDIO_PACKET_SIZE); data = buf->data + (buf->cons % buf->size); - buf->cons += USBAUDIO_PACKET_SIZE; + *len = MIN(buf->prod - buf->cons, + buf->size - (buf->cons % buf->size)); return data; } @@ -374,16 +375,21 @@ static void output_callback(void *opaque, int avail) USBAudioState *s = opaque; uint8_t *data; - for (;;) { - if (avail < USBAUDIO_PACKET_SIZE) { - return; - } - data = streambuf_get(&s->out.buf); + while (avail) { + size_t written, len; + + data = streambuf_get(&s->out.buf, &len); if (!data) { return; } - AUD_write(s->out.voice, data, USBAUDIO_PACKET_SIZE); - avail -= USBAUDIO_PACKET_SIZE; + + written = AUD_write(s->out.voice, data, len); + avail -= written; + s->out.buf.cons += written; + + if (written < len) { + return; + } } } -- 2.22.0