The following changes since commit c5e4e49258e9b89cb34c085a419dd9f862935c48:
Merge remote-tracking branch 'remotes/xanclic/tags/pull-block-2018-09-25' into staging (2018-09-25 16:47:35 +0100) are available in the Git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to f3df030edf90db184cd029697e976e24f1925e03: e1000: indicate dropped packets in HW counters (2018-09-26 11:06:10 +0800) ---------------------------------------------------------------- ---------------------------------------------------------------- Jason Wang (4): ne2000: fix possible out of bound access in ne2000_receive rtl8139: fix possible out of bound access pcnet: fix possible buffer overflow net: ignore packet size greater than INT_MAX Martin Wilck (1): e1000: indicate dropped packets in HW counters Zhang Chen (15): filter-rewriter: Add TCP state machine and fix memory leak in connection_track_table colo-compare: implement the process of checkpoint colo-compare: use notifier to notify packets comparing result COLO: integrate colo compare with colo frame COLO: Add block replication into colo process COLO: Remove colo_state migration struct COLO: Load dirty pages into SVM's RAM cache firstly ram/COLO: Record the dirty pages that SVM received COLO: Flush memory data from ram cache qapi/migration.json: Rename COLO unknown mode to none mode. qapi: Add new command to query colo status savevm: split the process of different stages for loadvm/savevm filter: Add handle_event method for NetFilterClass filter-rewriter: handle checkpoint and failover event docs: Add COLO status diagram to COLO-FT.txt liujunjie (1): clean up callback when del virtqueue zhanghailiang (4): qmp event: Add COLO_EXIT event to notify users while exited COLO COLO: flush host dirty ram from cache COLO: notify net filters about checkpoint/failover event COLO: quick failover process by kick COLO thread docs/COLO-FT.txt | 34 ++++++++ hw/net/e1000.c | 16 +++- hw/net/ne2000.c | 4 +- hw/net/pcnet.c | 4 +- hw/net/rtl8139.c | 8 +- hw/net/trace-events | 3 + hw/virtio/virtio.c | 2 + include/exec/ram_addr.h | 1 + include/migration/colo.h | 11 ++- include/net/filter.h | 5 ++ migration/Makefile.objs | 2 +- migration/colo-comm.c | 76 ----------------- migration/colo-failover.c | 2 +- migration/colo.c | 212 +++++++++++++++++++++++++++++++++++++++++++--- migration/migration.c | 46 ++++++++-- migration/ram.c | 166 +++++++++++++++++++++++++++++++++++- migration/ram.h | 4 + migration/savevm.c | 53 ++++++++++-- migration/savevm.h | 5 ++ migration/trace-events | 3 + net/colo-compare.c | 115 ++++++++++++++++++++++--- net/colo-compare.h | 24 ++++++ net/colo.c | 10 ++- net/colo.h | 11 +-- net/filter-rewriter.c | 166 +++++++++++++++++++++++++++++++++--- net/filter.c | 17 ++++ net/net.c | 26 +++++- qapi/migration.json | 80 +++++++++++++++-- vl.c | 2 - 29 files changed, 957 insertions(+), 151 deletions(-) delete mode 100644 migration/colo-comm.c create mode 100644 net/colo-compare.h
