From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:51586)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1SRNhy-0003XI-Pj
	for qemu-devel@nongnu.org; Mon, 07 May 2012 09:10:40 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1SRNhq-0006XN-Up
	for qemu-devel@nongnu.org; Mon, 07 May 2012 09:10:34 -0400
Received: from mx1.redhat.com ([209.132.183.28]:20370)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1SRNhq-0006Wg-Mw
	for qemu-devel@nongnu.org; Mon, 07 May 2012 09:10:26 -0400
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
	(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q47DAO3f018306
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Mon, 7 May 2012 09:10:24 -0400
Date: Mon, 7 May 2012 16:10:29 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20120507131028.GA20357@redhat.com>
References: <1336392045-31211-1-git-send-email-avi@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1336392045-31211-1-git-send-email-avi@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] rtl8139: fix regression in TxStatus/TxAddr
	read
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: <http://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>
To: Avi Kivity <avi@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>, qemu-devel@nongnu.org

On Mon, May 07, 2012 at 03:00:45PM +0300, Avi Kivity wrote:
> Commit afe0a595356192 added byte reads for TxStatus/TxAddr, but
> broke 32-bit reads; the mask generation
> 
>    (1 << (8 * size)) - 1
> 
> is unspecified in C for size >= sizeof(int), and in fact returns 0
> on x86.
> 
> Fix by using a larger type.
> 
> Fixes (at least) Fedora 9 i386 with -machine kernel_irqchip=on.  I
> didn't see it with the qemu APIC implementation; may be due to timing
> or (more likely) a tester error.
> 
> Signed-off-by: Avi Kivity <avi@redhat.com>

Applied, thanks

> ---
>  hw/rtl8139.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/rtl8139.c b/hw/rtl8139.c
> index 4d0f5ba..eb22d04 100644
> --- a/hw/rtl8139.c
> +++ b/hw/rtl8139.c
> @@ -2500,7 +2500,7 @@ static uint32_t rtl8139_TxStatus_TxAddr_read(RTL8139State *s, uint32_t regs[],
>      case 1: /* fall through */
>      case 2: /* fall through */
>      case 4:
> -        ret = (regs[reg] >> offset * 8) & ((1 << (size * 8)) - 1);
> +        ret = (regs[reg] >> offset * 8) & (((uint64_t)1 << (size * 8)) - 1);
>          DPRINTF("TxStatus/TxAddr[%d] read addr=0x%x size=0x%x val=0x%08x\n",
>                  reg, addr, size, ret);
>          break;
> -- 
> 1.7.10.1