diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/net/e1000e.c | 4 | ||||
| -rw-r--r-- | hw/net/e1000e_core.c | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 61bcbb6083..692283fdd7 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -133,7 +133,7 @@ static uint64_t e1000e_io_read(void *opaque, hwaddr addr, unsigned size) { E1000EState *s = opaque; - uint32_t idx; + uint32_t idx = 0; uint64_t val; switch (addr) { @@ -158,7 +158,7 @@ e1000e_io_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { E1000EState *s = opaque; - uint32_t idx; + uint32_t idx = 0; switch (addr) { case E1000_IOADDR: diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 6a44ea1c3f..4549acb120 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -523,8 +523,15 @@ e1000e_rss_get_hash_type(E1000ECore *core, struct NetRxPkt *pkt) bool ex_dis = core->mac[RFCTL] & E1000_RFCTL_IPV6_EX_DIS; bool new_ex_dis = core->mac[RFCTL] & E1000_RFCTL_NEW_IPV6_EXT_DIS; - trace_e1000e_rx_rss_ip6(core->mac[RFCTL], - ex_dis, new_ex_dis, istcp, + /* + * Following two traces must not be combined because resulting + * event will have 11 arguments totally and some trace backends + * (at least "ust") have limitation of maximum 10 arguments per + * event. Events with more arguments fail to compile for + * backends like these. + */ + trace_e1000e_rx_rss_ip6_rfctl(core->mac[RFCTL]); + trace_e1000e_rx_rss_ip6(ex_dis, new_ex_dis, istcp, ip6info->has_ext_hdrs, ip6info->rss_ex_dst_valid, ip6info->rss_ex_src_valid, |