From patchwork Wed Jan 16 23:37:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 1026322 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SjgcSjXs"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43g4Fk2Zdfz9sCX for ; Thu, 17 Jan 2019 11:09:46 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38755 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjvFg-0003KP-8t for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2019 19:09:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjul9-0004Qc-5M for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:38:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjul6-0003ZX-TK for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:38:11 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:55755) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gjul6-0003Wh-L6 for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:38:08 -0500 Received: by mail-wm1-x342.google.com with SMTP id y139so3851834wmc.5 for ; Wed, 16 Jan 2019 15:38:08 -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=AyJ30updK3hnIixXSYEwUA0xI8Q1m4nxDMv/ypz28XA=; b=SjgcSjXs5NgBI83R7fr82+vLT724Erku/MeQ6z3F7KABWaCOGZplXxu5+JA8KQOvPE rqf7lhOjIoTQIUAoVH22m7rYqCrWvhuoNigdMt4fQZUuz1qz7+Qf3HFeg/dcsuehnFIK i5fzlG5FYHbM86iskAA1AySRqYkl71w6oDG6RkAd7aMhany5Zaxfd1dORRshTuC6Zw4G K3oZJpsANt7jqQ5mncuX5YVFpHo8O/cxSaZXwB0Vb/SgPrrNEtKmrm27G16tlQanJpqs Oe4PRIQqfM2rE6ZL00mAcNGJdpUSwukynqDAiPlw4DUM4KQvKbr55TyyYPU/HxXHD6/5 v2Uw== 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=AyJ30updK3hnIixXSYEwUA0xI8Q1m4nxDMv/ypz28XA=; b=E/ChpWDOmFGqnyEt6Zi4SnsfHl07y3qaFV1SwZ0GY7LfkcuZWujPxn5r8DT61tso1K +LsKM2qYhV9RHqhOYeSKiA6mKZ5UQEBivyT16q/6sElN0L9xU/LzolY5ta5HIR2GUqQe n5pTQ/Fn8ns733T0K/2v9skaG3v2wwN8wEJQQYMire1W107+3GQHuMHhSV6fmCarEHqH ieZhVhI/K93P0oXLVzOfKJ4jRZ1jTG8jk7WA+ZLE2XEkDoW0XbDci+/lAXoTqF8vYLyp u77CCMEIIYK4cIrWNyIOJLaQtW4IArqlQy/mDMcxKpxDh1a65Jq8qRsXeQ3/3+q4Xcbf 3I/w== X-Gm-Message-State: AJcUuke1kk9GQ6M6aqQf72WV+H3/5rlkKyALViPHeGiGQ9YdlnxIoqNe VgX5hZBcAXYqgLYg3EQj+2DZPw6rQzU= X-Google-Smtp-Source: ALg8bN7ZWo238/W6eWpIoD0ufCcSkHmjcUhT9yQ/6obXfmFTtu9KvM1O6isL6zpxRT2dj7bR5esWRw== X-Received: by 2002:a1c:3282:: with SMTP id y124mr9720064wmy.134.1547681887515; Wed, 16 Jan 2019 15:38:07 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-e4b0-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:e4b0::5]) by smtp.gmail.com with ESMTPSA id s66sm30760437wmf.34.2019.01.16.15.38.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 15:38:07 -0800 (PST) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= To: qemu-devel@nongnu.org Date: Thu, 17 Jan 2019 00:37:21 +0100 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v3 48/50] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 84e737808c..0bfdd52423 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -318,30 +318,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; } @@ -373,16 +374,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; + } } }