From nobody Fri Apr 26 07:46:57 2024 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; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500284042945970.4824816541006; Mon, 17 Jul 2017 02:34:02 -0700 (PDT) Received: from localhost ([::1]:49000 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX2Ph-0004Zt-Cs for importer@patchew.org; Mon, 17 Jul 2017 05:34:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX2LN-0001NE-7H for qemu-devel@nongnu.org; Mon, 17 Jul 2017 05:29:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX2LI-0003gr-Ly for qemu-devel@nongnu.org; Mon, 17 Jul 2017 05:29:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52313) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dX2LI-0003gK-Gq for qemu-devel@nongnu.org; Mon, 17 Jul 2017 05:29:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7B23A81233; Mon, 17 Jul 2017 09:29:27 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-225.ams2.redhat.com [10.36.116.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F5F060BF1; Mon, 17 Jul 2017 09:29:24 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D7D3F1602AF; Mon, 17 Jul 2017 11:29:23 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7B23A81233 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7B23A81233 From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 17 Jul 2017 11:29:21 +0200 Message-Id: <20170717092923.12317-2-kraxel@redhat.com> In-Reply-To: <20170717092923.12317-1-kraxel@redhat.com> References: <20170717092923.12317-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 17 Jul 2017 09:29:27 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/3] audio: st_rate_flow exist a infinite loop 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: Peng Hao , Wang Yechao , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peng Hao If a voice recording equipment is opened for a long time(several days) in windows guest, rate->ipos will overflow and rate->opos will never have a chance to change. It will result to a infinite loop. Signed-off-by: Peng Hao Signed-off-by: Wang Yechao Message-id: 1500128061-20849-1-git-send-email-peng.hao2@zte.com.cn Signed-off-by: Gerd Hoffmann --- audio/rate_template.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/audio/rate_template.h b/audio/rate_template.h index bd4b1c7685..6e93588877 100644 --- a/audio/rate_template.h +++ b/audio/rate_template.h @@ -71,6 +71,12 @@ void NAME (void *opaque, struct st_sample *ibuf, struct = st_sample *obuf, while (rate->ipos <=3D (rate->opos >> 32)) { ilast =3D *ibuf++; rate->ipos++; + + /* if ipos overflow, there is a infinite loop */ + if (rate->ipos =3D=3D 0xffffffff) { + rate->ipos =3D 1; + rate->opos =3D rate->opos & 0xffffffff; + } /* See if we finished the input buffer yet */ if (ibuf >=3D iend) { goto the_end; --=20 2.9.3 From nobody Fri Apr 26 07:46:57 2024 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; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500283933420273.35071461803307; Mon, 17 Jul 2017 02:32:13 -0700 (PDT) Received: from localhost ([::1]:48992 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX2Nw-00039H-85 for importer@patchew.org; Mon, 17 Jul 2017 05:32:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX2LM-0001Mp-P6 for qemu-devel@nongnu.org; Mon, 17 Jul 2017 05:29:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX2LI-0003gY-9t for qemu-devel@nongnu.org; Mon, 17 Jul 2017 05:29:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49160) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dX2LI-0003gE-1V for qemu-devel@nongnu.org; Mon, 17 Jul 2017 05:29:28 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 05A5C80460; Mon, 17 Jul 2017 09:29:27 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-225.ams2.redhat.com [10.36.116.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B61F7E666; Mon, 17 Jul 2017 09:29:24 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E07F11602B0; Mon, 17 Jul 2017 11:29:23 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 05A5C80460 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 05A5C80460 From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 17 Jul 2017 11:29:22 +0200 Message-Id: <20170717092923.12317-3-kraxel@redhat.com> In-Reply-To: <20170717092923.12317-1-kraxel@redhat.com> References: <20170717092923.12317-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 17 Jul 2017 09:29:27 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/3] audio/fmopl: modify timer callback to give opaque and channel parameters in two arguments 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: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Herv=C3=A9 Poussineau Signed-off-by: Herv=C3=A9 Poussineau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20170621043401.19842-2-hpoussin@reactos.org Signed-off-by: Gerd Hoffmann --- hw/audio/fmopl.h | 7 ++++--- hw/audio/adlib.c | 2 +- hw/audio/fmopl.c | 18 +++++++++++++----- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h index fc9f16b58a..f4065f425c 100644 --- a/hw/audio/fmopl.h +++ b/hw/audio/fmopl.h @@ -3,7 +3,7 @@ =20 #include =20 -typedef void (*OPL_TIMERHANDLER)(int channel,double interval_Sec); +typedef void (*OPL_TIMERHANDLER)(void *param, int channel, double interval= _Sec); =20 /* !!!!! here is private section , do not access there member direct !!!!!= */ =20 @@ -87,13 +87,14 @@ typedef struct fm_opl_f { uint8_t wavesel; /* external event callback handler */ OPL_TIMERHANDLER TimerHandler; /* TIMER handler */ - int TimerParam; /* TIMER parameter */ + void *TimerParam; /* TIMER parameter */ } FM_OPL; =20 /* ---------- Generic interface section ---------- */ FM_OPL *OPLCreate(int clock, int rate); void OPLDestroy(FM_OPL *OPL); -void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int chan= nelOffset); +void OPLSetTimerHandler(FM_OPL *OPL, OPL_TIMERHANDLER TimerHandler, + void *param); =20 int OPLWrite(FM_OPL *OPL,int a,int v); unsigned char OPLRead(FM_OPL *OPL,int a); diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index c6e0f10c16..be4203476a 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -130,7 +130,7 @@ static uint32_t adlib_read(void *opaque, uint32_t nport) return data; } =20 -static void timer_handler (int c, double interval_Sec) +static void timer_handler (void *opaque, int c, double interval_Sec) { AdlibState *s =3D glob_adlib; unsigned n =3D c & 1; diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c index 202f752c5d..5cfb6a96dd 100644 --- a/hw/audio/fmopl.c +++ b/hw/audio/fmopl.c @@ -788,14 +788,18 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v) { double interval =3D st2 ? (double)OPL->T[1]*OPL->TimerBase : 0.0; OPL->st[1] =3D st2; - if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+1,interval= ); + if (OPL->TimerHandler) { + (OPL->TimerHandler)(OPL->TimerParam, 1, interval); + } } /* timer 1 */ if(OPL->st[0] !=3D st1) { double interval =3D st1 ? (double)OPL->T[0]*OPL->TimerBase : 0.0; OPL->st[0] =3D st1; - if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+0,interval= ); + if (OPL->TimerHandler) { + (OPL->TimerHandler)(OPL->TimerParam, 0, interval); + } } } return; @@ -1128,10 +1132,11 @@ void OPLDestroy(FM_OPL *OPL) =20 /* ---------- Option handlers ---------- */ =20 -void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int chan= nelOffset) +void OPLSetTimerHandler(FM_OPL *OPL, OPL_TIMERHANDLER TimerHandler, + void *param) { OPL->TimerHandler =3D TimerHandler; - OPL->TimerParam =3D channelOffset; + OPL->TimerParam =3D param; } =20 /* ---------- YM3812 I/O interface ---------- */ @@ -1197,6 +1202,9 @@ int OPLTimerOver(FM_OPL *OPL,int c) } } /* reload timer */ - if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+c,(double)OPL-= >T[c]*OPL->TimerBase); + if (OPL->TimerHandler) { + (OPL->TimerHandler)(OPL->TimerParam, c, + (double)OPL->T[c] * OPL->TimerBase); + } return OPL->status>>7; } --=20 2.9.3 From nobody Fri Apr 26 07:46:57 2024 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; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500284111684896.4374735446379; Mon, 17 Jul 2017 02:35:11 -0700 (PDT) Received: from localhost ([::1]:49002 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX2Qo-0005NV-JY for importer@patchew.org; Mon, 17 Jul 2017 05:35:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX2LN-0001NB-6l for qemu-devel@nongnu.org; Mon, 17 Jul 2017 05:29:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX2LI-0003gy-PU for qemu-devel@nongnu.org; Mon, 17 Jul 2017 05:29:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49174) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dX2LI-0003gO-JS for qemu-devel@nongnu.org; Mon, 17 Jul 2017 05:29:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6E0248046A; Mon, 17 Jul 2017 09:29:27 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-225.ams2.redhat.com [10.36.116.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id A268F183C2; Mon, 17 Jul 2017 09:29:24 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E76E31602B2; Mon, 17 Jul 2017 11:29:23 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6E0248046A Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 6E0248046A From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 17 Jul 2017 11:29:23 +0200 Message-Id: <20170717092923.12317-4-kraxel@redhat.com> In-Reply-To: <20170717092923.12317-1-kraxel@redhat.com> References: <20170717092923.12317-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 17 Jul 2017 09:29:27 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/3] audio/adlib: remove limitation of one adlib card 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: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Herv=C3=A9 Poussineau Signed-off-by: Herv=C3=A9 Poussineau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20170621043401.19842-3-hpoussin@reactos.org Signed-off-by: Gerd Hoffmann --- hw/audio/adlib.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index be4203476a..97b876c7e0 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -74,8 +74,6 @@ typedef struct { PortioList port_list; } AdlibState; =20 -static AdlibState *glob_adlib; - static void adlib_stop_opl_timer (AdlibState *s, size_t n) { OPLTimerOver (s->opl, n); @@ -132,7 +130,7 @@ static uint32_t adlib_read(void *opaque, uint32_t nport) =20 static void timer_handler (void *opaque, int c, double interval_Sec) { - AdlibState *s =3D glob_adlib; + AdlibState *s =3D opaque; unsigned n =3D c & 1; #ifdef DEBUG double interval; @@ -259,19 +257,13 @@ static void adlib_realizefn (DeviceState *dev, Error = **errp) AdlibState *s =3D ADLIB(dev); struct audsettings as; =20 - if (glob_adlib) { - error_setg (errp, "Cannot create more than 1 adlib device"); - return; - } - glob_adlib =3D s; - s->opl =3D OPLCreate (3579545, s->freq); if (!s->opl) { error_setg (errp, "OPLCreate %d failed", s->freq); return; } else { - OPLSetTimerHandler (s->opl, timer_handler, 0); + OPLSetTimerHandler(s->opl, timer_handler, s); s->enabled =3D 1; } =20 --=20 2.9.3