Message ID | 20210726214729.2062862-9-richard.henderson@linaro.org |
---|---|
State | Accepted |
Commit | 79fe9e4313f9dbad8ee4619031900ccabd4f8824 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a17:907:d92:0:0:0:0 with SMTP id go18csp4018891ejc; Mon, 26 Jul 2021 14:54:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbIpUxojbOWwBlPj52I8jn/adHST2vmkHzEV0CwzYUV2aZ3QwbBmCrNkQiTFUnZOng/zOd X-Received: by 2002:a05:6e02:13d3:: with SMTP id v19mr14858356ilj.167.1627336453464; Mon, 26 Jul 2021 14:54:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627336453; cv=none; d=google.com; s=arc-20160816; b=IK4Mu7vnVba0VHH357ov4Wj9FSKbCx8+zMekWW6nPH75QKE7cqS0Kjql8RB8M7w0au +8Dm2w73CRtLDHDUe6t1nOazPL2hZwUU04nO2I5ikhwXjoQvDjt4cpx9gbzniTihfuA4 yal/+VYqv5ln1yTx8jcUmmicsL8kGrqeP4DSu1WeiGRD/U3XakkIy0HrBjqexM6hPHNA xuLcA3ZncPWr5v551Wj+BuKuVC5u9whc70Z+j4Dxf4O6C7eDX0ekKypL7dpJiHHMnASu UcmKd0SoY6I3fbcJvKonH32dqDiUGBpaIvgQnfVi4vmIVrBr04QMjhFEh+Y7o64+Jgqk zWiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=hBw/k/z1d1LuXlQIfNytxkYVglrkLJic6NwTbw5pZ6k=; b=MRHXbpoDrXrTz+G5MCJmdPOjJiTgEVukI6VShG4CPk1koPDfTkMCy5gGEKBhXb8z38 DNLBTRRrI1liX4IaB756SWeMyO0sTTFmy07yZ8pAClbSF90x/oRtwJ4tFC7vky8e8q59 13x3NRwCrSiWY/WVaZMTcZ/A36Q8Um0KF3RD8wp7PBEUCttkTonACUtRGFThZavEZPwd kK6qi7SDyZFNQrcFbNB6rL/SJIwxJPwrpLeRj0ftIhhHBVGid631AkBMijg2lSFVRsK9 kbI9DbIXZN3yrtdNR7hlGv+78JMGJJL6+mXbLrlNevjfPHqsKeefGQLV3vQZAkm850+A wYcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l33IWsMQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w3si1040423ilv.30.2021.07.26.14.54.13 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jul 2021 14:54:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l33IWsMQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1m88Y8-0008Ks-Qn for patch@linaro.org; Mon, 26 Jul 2021 17:54:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>) id 1m88Ru-0002oN-PU for qemu-devel@nongnu.org; Mon, 26 Jul 2021 17:47:46 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]:43870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>) id 1m88Rt-0006CA-CB for qemu-devel@nongnu.org; Mon, 26 Jul 2021 17:47:46 -0400 Received: by mail-pj1-x102a.google.com with SMTP id m2-20020a17090a71c2b0290175cf22899cso1996005pjs.2 for <qemu-devel@nongnu.org>; Mon, 26 Jul 2021 14:47:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hBw/k/z1d1LuXlQIfNytxkYVglrkLJic6NwTbw5pZ6k=; b=l33IWsMQPbf86P04iYHNsp+qAgfxZphHHggKUMScjDzq1krMgmNj15Vdrg9+o5NgDm 5TyFP7r6zI4F6RSdupyqKcAgpyHP/qAcjH74cDZU+TjEPMRVcwSk9lH7eEq0HzAI8qXZ Jcn0BUTTSGLJttviUsfG0OwLdM/VYYUZZnaer52xj7y7UUFfG/f/bBMSgZQCBA+bTKex KiesKJpMDi8ujIgiO5Iiw4WT0HqHGX3oRbCvcM1o9AfTiaBWMXXtrALcIOUor4IhMySa SCR53DfbI3C2qODUuTlG1CHC9hsTUKk1gD0S3eKJcNT7bQhwKB7gDZ1snw7T6vxYJkG8 jnvA== 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=hBw/k/z1d1LuXlQIfNytxkYVglrkLJic6NwTbw5pZ6k=; b=mhBFaZM//MJ4s0U5giNbOk8aV1OC1aznrWVLCMInmihgZBzRbR8gLco/f5zlhJZLK6 2xR21Z4B+Ul37fcV7jJgUcCSxpxtisaDxYhk/RCrqowgff9Xsg8B7i7kATaXdR2FiJ/s c78qhdG9FQrRICzfkNdn6T9AJDxPhGh1G3LUjQOLrh9W7yP5PD0d1vmMK9Cr6zJZXUdG EfZSfOMD9OEgO0c3hT3t+qW7tBHhTnN3sp+gU4fk2vnhQeJIyB4M9caVOR5UfMK0ECdq 5RH1wUK0QfijuJIa4Jj8pgGoyA8n0bX7IiolDfQJGMFWjjZuM74Kv6NinoxBBPcO11V7 +0Ww== X-Gm-Message-State: AOAM533xOD1u3ys3kZ5Le48FP93OJqLqO/IH7QihTGUNbY3GJdOZ+aZk /Zl1Dk4cuG0QiFPAjteZQLu/Y0lIxAXxmg== X-Received: by 2002:a17:902:eb52:b029:129:bc24:ce5e with SMTP id i18-20020a170902eb52b0290129bc24ce5emr15754029pli.67.1627336064191; Mon, 26 Jul 2021 14:47:44 -0700 (PDT) Received: from cloudburst.home (2603-800c-3202-ffa7-497b-6ae4-953c-7ad1.res6.spectrum.com. [2603:800c:3202:ffa7:497b:6ae4:953c:7ad1]) by smtp.gmail.com with ESMTPSA id e8sm997679pfm.218.2021.07.26.14.47.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 14:47:43 -0700 (PDT) From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL for-6.1 08/12] hw/audio/adlib: Remove unused variable in adlib_callback Date: Mon, 26 Jul 2021 11:47:25 -1000 Message-Id: <20210726214729.2062862-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210726214729.2062862-1-richard.henderson@linaro.org> References: <20210726214729.2062862-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
tcg and misc patch queue
|
expand
|
diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index 42d50d2fdc..5f979b1487 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -186,7 +186,7 @@ static int write_audio (AdlibState *s, int samples) static void adlib_callback (void *opaque, int free) { AdlibState *s = opaque; - int samples, net = 0, to_play, written; + int samples, to_play, written; samples = free >> SHIFT; if (!(s->active && s->enabled) || !samples) { @@ -219,7 +219,6 @@ static void adlib_callback (void *opaque, int free) written = write_audio (s, samples); if (written) { - net += written; samples -= written; s->pos = (s->pos + written) % s->samples; }