Commit 74bbfe02 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging 



# gpg: Signature made Fri 08 Sep 2017 03:00:34 BST
# gpg:                using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  colo-compare: Update the COLO document to add the IOThread configuration
  colo-compare: Use IOThread to Check old packet regularly and Process pactkets of the primary
  qemu-iothread: IOThread supports the GMainContext event loop
  net/colo-compare.c: Fix comments and scheme
  net/colo-compare.c: Adjust net queue pop order for performance
  net/colo-compare.c: Optimize unpredictable tcp options comparison
  e1000: Rename the SEC symbol to SEQEC
  net/socket: Improve -net socket error reporting
  net/net: Convert parse_host_port() to Error
  net/socket: Convert several helper functions to Error
  net/socket: Don't treat odd socket type as SOCK_STREAM
  MAINTAINERS: Update mail address for COLO Proxy
  net: rtl8139: do not use old_mmio accesses
  net/rocker: Fix the unusual macro name
  net/rocker: Convert to realize()
  net/rocker: Plug memory leak in pci_rocker_init()
  net/rocker: Remove the dead error handling
  net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b3a1179f 861d51e6

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1577,7 +1577,7 @@ F: include/migration/failover.h 
F: docs/COLO-FT.txt



COLO Proxy

M: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

M: Zhang Chen <zhangckid@gmail.com>

M: Li Zhijian <lizhijian@cn.fujitsu.com>

S: Supported

F: docs/colo-proxy.txt

docs/colo-proxy.txt

+2 −1
Original line number Diff line number Diff line
@@ -170,10 +170,11 @@ Primary(ip:3.3.3.3): 
-chardev socket,id=compare0-0,host=3.3.3.3,port=9001

-chardev socket,id=compare_out,host=3.3.3.3,port=9005,server,nowait

-chardev socket,id=compare_out0,host=3.3.3.3,port=9005

-object iothread,id=iothread1

-object filter-mirror,id=m0,netdev=hn0,queue=tx,outdev=mirror0

-object filter-redirector,netdev=hn0,id=redire0,queue=rx,indev=compare_out

-object filter-redirector,netdev=hn0,id=redire1,queue=rx,outdev=compare0

-object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0

-object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,iothread=iothread1



Secondary(ip:3.3.3.8):

-netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown

hw/net/e1000.c

+2 −2
Original line number Diff line number Diff line
@@ -1127,7 +1127,7 @@ static uint32_t (*macreg_readops[])(E1000State *, int) = { 
    getreg(TADV),     getreg(ITR),      getreg(FCRUC),    getreg(IPAV),

    getreg(WUC),      getreg(WUS),      getreg(SCC),      getreg(ECOL),

    getreg(MCC),      getreg(LATECOL),  getreg(COLC),     getreg(DC),

    getreg(TNCRS),    getreg(SEC),      getreg(CEXTERR),  getreg(RLEC),

    getreg(TNCRS),    getreg(SEQEC),    getreg(CEXTERR),  getreg(RLEC),

    getreg(XONRXC),   getreg(XONTXC),   getreg(XOFFRXC),  getreg(XOFFTXC),

    getreg(RFC),      getreg(RJC),      getreg(RNBC),     getreg(TSCTFC),

    getreg(MGTPRC),   getreg(MGTPDC),   getreg(MGTPTC),   getreg(GORCL),
@@ -1223,7 +1223,7 @@ static const uint8_t mac_reg_access[0x8000] = { 
    [FFLT]    = markflag(MAC),    [FFMT]    = markflag(MAC),

    [SCC]     = markflag(MAC),    [FCRUC]   = markflag(MAC),

    [LATECOL] = markflag(MAC),    [COLC]    = markflag(MAC),

    [SEC]     = markflag(MAC),    [CEXTERR] = markflag(MAC),

    [SEQEC]   = markflag(MAC),    [CEXTERR] = markflag(MAC),

    [XONTXC]  = markflag(MAC),    [XOFFRXC] = markflag(MAC),

    [RJC]     = markflag(MAC),    [RNBC]    = markflag(MAC),

    [MGTPDC]  = markflag(MAC),    [MGTPTC]  = markflag(MAC),

hw/net/e1000_regs.h

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ 
#define E1000_COLC     0x04028  /* Collision Count - R/clr */

#define E1000_DC       0x04030  /* Defer Count - R/clr */

#define E1000_TNCRS    0x04034  /* TX-No CRS - R/clr */

#define E1000_SEC      0x04038  /* Sequence Error Count - R/clr */

#define E1000_SEQEC    0x04038  /* Sequence Error Count - R/clr */

#define E1000_CEXTERR  0x0403C  /* Carrier Extension Error Count - R/clr */

#define E1000_RLEC     0x04040  /* Receive Length Error Count - R/clr */

#define E1000_XONRXC   0x04048  /* XON RX Count - R/clr */

hw/net/e1000e_core.c

+1 −1
Original line number Diff line number Diff line
@@ -2855,7 +2855,7 @@ static uint32_t (*e1000e_macreg_readops[])(E1000ECore *, int) = { 
    e1000e_getreg(RDLEN0),

    e1000e_getreg(RDH1),

    e1000e_getreg(LATECOL),

    e1000e_getreg(SEC),

    e1000e_getreg(SEQEC),

    e1000e_getreg(XONTXC),

    e1000e_getreg(WUS),

    e1000e_getreg(GORCL),