From nobody Wed Nov 12 08:39:11 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=1568929771; cv=none; d=zoho.com; s=zohoarc; b=ihkPfY8h+Z7SO/zUnCFq5r+dnNKWQUgdKcv21lEhvn4swTxK8gV3k09bCB3AxNt0MZ0yPfavcZeOHcfi4vjM3d/6MR9cL15vB6rli3eN6vUEi4wbJrDaLUEyXuY6S8UNunhXCxdTGd9zjAaK+jM23Ed+KSksz7UY201wLWWM/wQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568929771; 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=P61KReWqK9/kZSjSN/NGnjSqdzL2NGnbxnuHHZbYYWKiuJieg8Tdw+5V3gu+k2vwacVVr+oEJYm596Oq1QxUgb+Cr+ibcHsTo2ILgRUp8aDnhw0uIx/aWDVXwnWxJ6UWA2xzZEyksUhBciTsSvrQRtDvWQmMAel9YNbSA2VHVuA= 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 156892977115768.94476583172423; Thu, 19 Sep 2019 14:49:31 -0700 (PDT) Received: from localhost ([::1]:48788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iB4Iq-0002Ct-Mi for importer@patchew.org; Thu, 19 Sep 2019 17:49:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53669) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iB3uv-0002uE-Qt for qemu-devel@nongnu.org; Thu, 19 Sep 2019 17:24:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iB3uu-0000k9-2G for qemu-devel@nongnu.org; Thu, 19 Sep 2019 17:24:45 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:45124) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iB3ut-0000jk-QL for qemu-devel@nongnu.org; Thu, 19 Sep 2019 17:24:43 -0400 Received: by mail-wr1-x442.google.com with SMTP id r5so4574832wrm.12 for ; Thu, 19 Sep 2019 14:24:43 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-74ef-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:74ef::5]) by smtp.gmail.com with ESMTPSA id w125sm13191292wmg.32.2019.09.19.14.24.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2019 14:24:42 -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=sEAIDvr/w/jncZIJMs54Dwu0Vf6ErZ6zInfGFlcIdGGHx0ARaMrzeZHH04/kn4zsdi 8vpxpliz6Pw7Q8Ye4VbHR6hAoWMqOSpIFifBdvW7Vv7nYBUXqslr9IDH0s/9KLBZ6Fpy o4wG/HMbY9+hhAYkeCrgJolnhIfE8VhYI8PYWd9qB2OZQI8XYKMj6oHRCO4L8YdkRQJq QLUQJRJVE51pOIqBJaSKm699xN64cRUeX4jMQko1cE/lUTUay+xQAb9BcdTJnrrPy7J5 rYAUmihTEd4wntEFDssFXa2A2rk8i7h57r36+a920RqVoSabazwbxi1nXVznh497opci f6fQ== 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=C9wpggCKMj099ZEb6qbMQ/6/tNvAZXzjyj7DwQul0/aWnAAmNiSXpOpt6YJobT57EM d2Hu1viiggqmyw3nOhVBI8txWRKrRP4Kip9WnJ4WwWkqlSrRGvX0rUcYbkJHheQRgM74 C2WH/Xguv20jjqvT/6CrGLMjwHpq1zOnO3lzqZjWPIYXChVnmIKskpsJ5GJcl8YV6F1H LQw0AI0bkX0o3JS7x8m1OTLIiJ8hWijRQm/9VERcXQKU/0hq6BAmc56IOLBCvz7Skyyq DGdY3vL3Hxmz3N9ffigKiPUfq3xoxG3qfD7y9Ep7WT0iABBwv89dAjOu9F4Hb8Q0gAc4 VImw== X-Gm-Message-State: APjAAAUNfBemjWTzWam92iwdskF45WPNXxm2BMzUW/gghN95YHxByXE1 MLJfsIOc3DoaO0HyRo66q4JI5q4b X-Google-Smtp-Source: APXvYqy57j1yKJ8ycKOBM8xXk+FK10g9C+YzUBKnW+tpElyuEeURZrmgAKbi6ZdgP7PUbfLMOOF5HA== X-Received: by 2002:a5d:4dcb:: with SMTP id f11mr2834732wru.239.1568928282547; Thu, 19 Sep 2019 14:24:42 -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 v4 22/24] usb-audio: do not count on avail bytes actually available Date: Thu, 19 Sep 2019 23:24:30 +0200 Message-Id: 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::442 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