OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

e1000: Fixing the received/transmitted packets' counters

Browse Source 
According to Intel's specs, these counters (as the other Statistic
registers) stick at 0xffffffff when this maximal value is reached.
Previously, they would reset after the max. value.

Signed-off-by: Leonid Bloch <leonid.bloch@ravellosystems.com>
Signed-off-by: Dmitry Fleytman <dmitry.fleytman@ravellosystems.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Leonid Bloch 2015-11-11 15:52:43 +02:00 committed by Jason Wang
parent 72ea771c97
commit 1f67f92c4f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/net/e1000.c
View File

@ -580,6 +580,14 @@ putsum(uint8_t *data, uint32_t n, uint32_t sloc, uint32_t css, uint32_t cse)
} }
} }
static inline void
inc_reg_if_not_full(E1000State *s, int index)
{
if (s->mac_reg[index] != 0xffffffff) {
s->mac_reg[index]++;
}
}
static inline int static inline int
vlan_enabled(E1000State *s) vlan_enabled(E1000State *s)
{ {
@ -677,8 +685,8 @@ xmit_seg(E1000State *s)
e1000_send_packet(s, tp->data, tp->size); e1000_send_packet(s, tp->data, tp->size);
} }
s->mac_reg[TPT]++; inc_reg_if_not_full(s, TPT);
s->mac_reg[GPTC]++; s->mac_reg[GPTC] = s->mac_reg[TPT];
n = s->mac_reg[TOTL]; n = s->mac_reg[TOTL];
if ((s->mac_reg[TOTL] += s->tx.size) < n) if ((s->mac_reg[TOTL] += s->tx.size) < n)
s->mac_reg[TOTH]++; s->mac_reg[TOTH]++;
@ -1091,8 +1099,8 @@ e1000_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt)
} }
} while (desc_offset < total_size); } while (desc_offset < total_size);
s->mac_reg[GPRC]++; inc_reg_if_not_full(s, TPR);
s->mac_reg[TPR]++; s->mac_reg[GPRC] = s->mac_reg[TPR];
/* TOR - Total Octets Received: /* TOR - Total Octets Received:
* This register includes bytes received in a packet from the <Destination * This register includes bytes received in a packet from the <Destination
* Address> field through the <CRC> field, inclusively. * Address> field through the <CRC> field, inclusively.