From nobody Wed Nov 12 10:12:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1569877239; cv=none; d=zoho.com; s=zohoarc; b=Q0E8fc28LDrRxJbwEo/e68F8+OyfltSng8YhVxi4JsDe5u4TJ2lq4hBaWhf1+AQ99eM3HEFyfSUHkY2aVr/v06IhxQUQnLjc8C/rzxU68o9LwUpioA4Cl1bmtXiw1Ztusb8Wif6Qqeq5XabFGaDHb6ssz6lpKufiS2ZwwuSMizo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569877239; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=8TTUthXqXhh1DdLxMpTCEbLpELmMAAhIVdhapb9+b1E=; b=WsBqtPy5YvAdjj1g7ZMssbcZO32ivrR3t1T6aCuDPjHhGxDe5/KLs+HztEVSH89DnaPrzQwwbhdKjU2xnml+TazKXrQk7OTCjYJnFAFHjMN+Bkt/ruTdFPx05nCwLn2s3f1Xp+TsJKTkaNCqOzodsFGJLKwVDmV5MZqp1brbkz0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569877239496751.2186596202425; Mon, 30 Sep 2019 14:00:39 -0700 (PDT) Received: from localhost ([::1]:57270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iF2mc-0006TS-BG for importer@patchew.org; Mon, 30 Sep 2019 17:00:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45780) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iF2He-00041A-MJ for qemu-devel@nongnu.org; Mon, 30 Sep 2019 16:28:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iF2Hd-0002Zw-Ea for qemu-devel@nongnu.org; Mon, 30 Sep 2019 16:28:38 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:42181) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iF2Hd-0002Xx-8A for qemu-devel@nongnu.org; Mon, 30 Sep 2019 16:28:37 -0400 Received: by mail-wr1-x443.google.com with SMTP id n14so12800120wrw.9 for ; Mon, 30 Sep 2019 13:28:37 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-e8f4-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:e8f4::5]) by smtp.gmail.com with ESMTPSA id o9sm34402911wrh.46.2019.09.30.13.28.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 13:28:35 -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=8TTUthXqXhh1DdLxMpTCEbLpELmMAAhIVdhapb9+b1E=; b=c/HvfcAtu2AfeIeujP5gSRO41UANWoaXa+paKfq/UTeBh7oee8LgiklZNUuclrkAt2 EfbMq2AeDpiEtb5Fos+SoTHub5R41mSTeCtUCZIDpxa3RjWwk4sa64Ml0Rii1RvhsF9Q fd2I5pbVCvtjd76BRTUoUDGy3A5babepdN4QeWWWFJbP67qChN3d9v4AuqlLKKlb4Cqn E83g1R/dXpbg0KBQFL2sVuFRhdqXDC2nmjrftRBO0yX5BB/M1Xv79irrtGBmHSnwz/zJ zVdJLEl8BLRkiWAPdca89pYwp8amqtBupgtxomXkCIzc2Bt8fRxklU5M6L/EBRE/mFOx yhkQ== 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=8TTUthXqXhh1DdLxMpTCEbLpELmMAAhIVdhapb9+b1E=; b=NqOV2DVUPWuHDjDWE//TKU0eMUuKNwf8cxbNz2XgDpQXM/uQjXTQhX8jTyEQ0ozzCN Uncozpo5b8iteRIg82D+1Nmct7qEk1mwR79GM32QAFgRZ8S/jJqFJFaGGNchcjhpEWFG Mokffj9KuSYzu/uhLmtnWcGl1nURULMv7dzrlM3TVpoNR0vZ6BR1K+o+yd7ej/BFcvco jSjX729TGBwMhsWMZzT19exkfPefNR4CWrtGpfpnb7JDIPJjBJjC1BXC4CPEwVxH+KmM 3QQUUp+DpbuxIQG2N3PUecBAE1n3OTARgC5+rb/jAZ5ibdHUeW0iFyMAlcA3vnkNEQ8y W65A== X-Gm-Message-State: APjAAAUIt0+0TzobJzIuG4jdtTSmHUGPzLXVgetqUi/9ACQY1NHcpWP4 9xmQBujKRJRxQi64T6e/PYGfB3+T X-Google-Smtp-Source: APXvYqyp75ef/rIs78JqH+Xwrj8XPtSCu/aCYcCN4wpj5scu6ii3yreItD0IDFxI+q/AsD7jvabYNg== X-Received: by 2002:a5d:5352:: with SMTP id t18mr15344507wrv.72.1569875316076; Mon, 30 Sep 2019 13:28:36 -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 Subject: [PATCH v5 07/10] usb-audio: do not count on avail bytes actually available Date: Mon, 30 Sep 2019 22:29:00 +0200 Message-Id: <4efbf065feca430f92c814aa71028df5571acb44.1569874641.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) This assumption is no longer true when mixeng is turned off. Signed-off-by: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n --- hw/usb/dev-audio.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 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, USBPa= cket *p) { uint32_t free =3D buf->size - (buf->prod - buf->cons); =20 - if (!free) { + if (free < USBAUDIO_PACKET_SIZE) { return 0; } if (p->iov.size !=3D USBAUDIO_PACKET_SIZE) { return 0; } - assert(free >=3D USBAUDIO_PACKET_SIZE); + usb_packet_copy(p, buf->data + (buf->prod % buf->size), USBAUDIO_PACKET_SIZE); buf->prod +=3D USBAUDIO_PACKET_SIZE; return USBAUDIO_PACKET_SIZE; } =20 -static uint8_t *streambuf_get(struct streambuf *buf) +static uint8_t *streambuf_get(struct streambuf *buf, size_t *len) { uint32_t used =3D buf->prod - buf->cons; uint8_t *data; =20 if (!used) { + *len =3D 0; return NULL; } - assert(used >=3D USBAUDIO_PACKET_SIZE); data =3D buf->data + (buf->cons % buf->size); - buf->cons +=3D USBAUDIO_PACKET_SIZE; + *len =3D MIN(buf->prod - buf->cons, + buf->size - (buf->cons % buf->size)); return data; } =20 @@ -374,16 +375,21 @@ static void output_callback(void *opaque, int avail) USBAudioState *s =3D opaque; uint8_t *data; =20 - for (;;) { - if (avail < USBAUDIO_PACKET_SIZE) { + while (avail) { + size_t written, len; + + data =3D streambuf_get(&s->out.buf, &len); + if (!data) { return; } - data =3D streambuf_get(&s->out.buf); - if (!data) { + + written =3D AUD_write(s->out.voice, data, len); + avail -=3D written; + s->out.buf.cons +=3D written; + + if (written < len) { return; } - AUD_write(s->out.voice, data, USBAUDIO_PACKET_SIZE); - avail -=3D USBAUDIO_PACKET_SIZE; } } =20 --=20 2.23.0