jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

e1000: Rename the SEC symbol to SEQEC

SunOS defines SEC in <sys/time.h> as 1 (commonly used time symbols).

This fixes build on SmartOS (Joyent).

Patch cherry-picked from pkgsrc by jperkin (Joyent).

Signed-off-by: Kamil Rytarowski <n54@gmx.com>
Reviewed-by: Dmitry Fleytman <dmitry@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>

authored by

Kamil Rytarowski and committed by
Jason Wang 757704f1 0522a959

+5 -5
+2 -2
hw/net/e1000.c
··· 1127 1127 getreg(TADV), getreg(ITR), getreg(FCRUC), getreg(IPAV), 1128 1128 getreg(WUC), getreg(WUS), getreg(SCC), getreg(ECOL), 1129 1129 getreg(MCC), getreg(LATECOL), getreg(COLC), getreg(DC), 1130 - getreg(TNCRS), getreg(SEC), getreg(CEXTERR), getreg(RLEC), 1130 + getreg(TNCRS), getreg(SEQEC), getreg(CEXTERR), getreg(RLEC), 1131 1131 getreg(XONRXC), getreg(XONTXC), getreg(XOFFRXC), getreg(XOFFTXC), 1132 1132 getreg(RFC), getreg(RJC), getreg(RNBC), getreg(TSCTFC), 1133 1133 getreg(MGTPRC), getreg(MGTPDC), getreg(MGTPTC), getreg(GORCL), ··· 1223 1223 [FFLT] = markflag(MAC), [FFMT] = markflag(MAC), 1224 1224 [SCC] = markflag(MAC), [FCRUC] = markflag(MAC), 1225 1225 [LATECOL] = markflag(MAC), [COLC] = markflag(MAC), 1226 - [SEC] = markflag(MAC), [CEXTERR] = markflag(MAC), 1226 + [SEQEC] = markflag(MAC), [CEXTERR] = markflag(MAC), 1227 1227 [XONTXC] = markflag(MAC), [XOFFRXC] = markflag(MAC), 1228 1228 [RJC] = markflag(MAC), [RNBC] = markflag(MAC), 1229 1229 [MGTPDC] = markflag(MAC), [MGTPTC] = markflag(MAC),
+1 -1
hw/net/e1000_regs.h
··· 260 260 #define E1000_COLC 0x04028 /* Collision Count - R/clr */ 261 261 #define E1000_DC 0x04030 /* Defer Count - R/clr */ 262 262 #define E1000_TNCRS 0x04034 /* TX-No CRS - R/clr */ 263 - #define E1000_SEC 0x04038 /* Sequence Error Count - R/clr */ 263 + #define E1000_SEQEC 0x04038 /* Sequence Error Count - R/clr */ 264 264 #define E1000_CEXTERR 0x0403C /* Carrier Extension Error Count - R/clr */ 265 265 #define E1000_RLEC 0x04040 /* Receive Length Error Count - R/clr */ 266 266 #define E1000_XONRXC 0x04048 /* XON RX Count - R/clr */
+1 -1
hw/net/e1000e_core.c
··· 2855 2855 e1000e_getreg(RDLEN0), 2856 2856 e1000e_getreg(RDH1), 2857 2857 e1000e_getreg(LATECOL), 2858 - e1000e_getreg(SEC), 2858 + e1000e_getreg(SEQEC), 2859 2859 e1000e_getreg(XONTXC), 2860 2860 e1000e_getreg(WUS), 2861 2861 e1000e_getreg(GORCL),
+1 -1
hw/net/e1000x_common.h
··· 40 40 defreg(VFTA), defreg(VET), defreg(RDTR), defreg(RADV), 41 41 defreg(TADV), defreg(ITR), defreg(SCC), defreg(ECOL), 42 42 defreg(MCC), defreg(LATECOL), defreg(COLC), defreg(DC), 43 - defreg(TNCRS), defreg(SEC), defreg(CEXTERR), defreg(RLEC), 43 + defreg(TNCRS), defreg(SEQEC), defreg(CEXTERR), defreg(RLEC), 44 44 defreg(XONRXC), defreg(XONTXC), defreg(XOFFRXC), defreg(XOFFTXC), 45 45 defreg(FCRUC), defreg(AIT), defreg(TDFH), defreg(TDFT), 46 46 defreg(TDFHS), defreg(TDFTS), defreg(TDFPC), defreg(WUC),