diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-08 09:41:10 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-08 09:41:10 -0500 |
| commit | 4f08129eeb42422655cc946a0a0c3accc2b8e3db (patch) | |
| tree | 3c9a4585181d7543fd6d272604e41e15270e07a0 /hw | |
| parent | 7c652c1eaf20b9271ebcc92b788d1fe656b3a774 (diff) | |
| parent | bdc62e62ead1a6c2a113934bf28cb5abef48618d (diff) | |
| download | qemu-4f08129eeb42422655cc946a0a0c3accc2b8e3db.zip qemu-4f08129eeb42422655cc946a0a0c3accc2b8e3db.tar.gz qemu-4f08129eeb42422655cc946a0a0c3accc2b8e3db.tar.bz2 | |
Merge remote-tracking branch 'mst/tags/for_anthony' into staging
* mst/tags/for_anthony:
rtl8139: fix regression in TxStatus/TxAddr read
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/rtl8139.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |