From nobody Fri Nov 7 03:55:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1545599918193175.2734877843144; Sun, 23 Dec 2018 13:18:38 -0800 (PST) Received: from localhost ([127.0.0.1]:59867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbB8o-00066p-OP for importer@patchew.org; Sun, 23 Dec 2018 16:18:30 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbAkV-0000QO-9Y for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:53:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbAkJ-0003rd-Hh for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:53:15 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43040) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbAkI-0003mI-Vz for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:53:11 -0500 Received: by mail-wr1-x443.google.com with SMTP id r10so10088349wrs.10 for ; Sun, 23 Dec 2018 12:53:10 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-24a3-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:24a3::5]) by smtp.gmail.com with ESMTPSA id g198sm25456920wmd.23.2018.12.23.12.53.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 12:53:09 -0800 (PST) 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=A1supMrKTSYMET4aKJaItJj2/zuxVrJZ8lTFZOxceuo=; b=or2gHcZtDUULs8at7S6KATW+PnaBFj0/RHiCkR78o3uet0zOloNdOTjUw3lNtOkA3I u7EoFLiOjkQD06zRkgXk4c0AbbN/0FOtnUIIHydlFRfjNmXWuKegNIivOUlY84+tDVhq 5qeREK2tClBGg3zMDqdMGI9IICdZhNFiQXzrtjdnIBvtZc7Zzr4Csu9UljKYicVN8U31 ti5eBg5JLVfO+QgCTi9W6cBnHUp3vbT4lk8QRZYHtyF3tWldifpc13cM1rcjYE/HkuPW POKGAg7kWTbm0z6gSqBPVMsI9Rx5Nbro6DBBPS1eLGMjjeQ7P6FbjVs2Luc9Xj3Em/kV FhZw== 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=A1supMrKTSYMET4aKJaItJj2/zuxVrJZ8lTFZOxceuo=; b=AaPD0vAJsE/f3yOzVHPLX7rnTBBPAnykYmJcrahiVUYH7Mk03IqMAmvk3k0mL3q0FN 6wgcEV7GB4YX5Z1k7KpzzIa5eZAodbLagHIVeGPyn6ebbxB1QkpwUGNC3VDETkr4LrQ2 jXs+AaWj74zhSGCpNAv0Hv94VzBzk1PQISBjRK39e8u0jaZLD2J8LstoJWrrG8kn75ZW mOCfXEGil8PTqXeyX1iC7ktd1tSpNihwUZu+aNrmLK5ZIWaZyV4kZleytK08nNZcwOxa xH/6z80NmQGQ7Y7L7j1r4NSSOstxfZL1P+tZ19R7p5+hy2ES6pJttZtqbV1txHyPwAR4 sMUA== X-Gm-Message-State: AJcUukcPHJ+0WyEbcIMRH7XJ1jSkC55IGnE0dhBUnDF9DAhzNfiMm21z 8fwqXXXLRUe8KmJhdGIcneQoPO2uXko= X-Google-Smtp-Source: ALg8bN6XjHy3/GGqOhNJoocRlebDTtEPyYDjgZxepCkeETFuNXv3P7psBFm/65pESheLVPJYVzrwPA== X-Received: by 2002:a5d:56d2:: with SMTP id m18mr10227934wrw.113.1545598389735; Sun, 23 Dec 2018 12:53:09 -0800 (PST) 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, 23 Dec 2018 21:52:26 +0100 Message-Id: X-Mailer: git-send-email 2.20.1 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 Subject: [Qemu-devel] [PATCH v2 50/52] usb-audio: do not count on avail bytes actually available X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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: fail (Header signature does not verify) 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 | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index 589977d96c..510585ad7a 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -318,27 +318,28 @@ 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; } - 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 @@ -370,16 +371,21 @@ static void output_callback(void *opaque, int avail) USBAudioState *s =3D opaque; uint8_t *data; =20 - for (;;) { - if (avail < USBAUDIO_PACKET_SIZE) { - return; - } - data =3D streambuf_get(&s->out.buf); + while (avail) { + size_t written, len; + + data =3D streambuf_get(&s->out.buf, &len); if (!data) { return; } - AUD_write(s->out.voice, data, USBAUDIO_PACKET_SIZE); - avail -=3D USBAUDIO_PACKET_SIZE; + + written =3D AUD_write(s->out.voice, data, len); + avail -=3D written; + s->out.buf.cons +=3D written; + + if (written < len) { + return; + } } } =20 --=20 2.20.1