The following changes since commit a73549f99612f758dec0fdea6ae1c30b6c709a0b:

  Merge remote-tracking branch 'remotes/kraxel/tags/ui-20181012-pull-request' into staging (2018-10-12 16:45:51 +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 a7ec0077c2db445d6bae421963188367d2695bd6:

  qemu-options: Fix bad "macaddr" property in the documentation (2018-10-15 16:14:15 +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

Thomas Huth (1):
      qemu-options: Fix bad "macaddr" property in the documentation

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
1;5202;0c1;5202;0c      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 +++++++++++++++--
 qemu-options.hx           |   2 +-
 vl.c                      |   2 -
 30 files changed, 958 insertions(+), 152 deletions(-)
 delete mode 100644 migration/colo-comm.c
 create mode 100644 net/colo-compare.h

On 15 October 2018 at 09:46, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit a73549f99612f758dec0fdea6ae1c30b6c709a0b:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/ui-20181012-pull-request' into staging (2018-10-12 16:45:51 +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 a7ec0077c2db445d6bae421963188367d2695bd6:
>
>   qemu-options: Fix bad "macaddr" property in the documentation (2018-10-15 16:14:15 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------

Hi; there seems to be a format string issue in this pullreq:

In file included from hw/net/trace.c:4:0:
hw/net/trace.h: In function '_nocheck__trace_e1000_receiver_overrun':
hw/net/trace.h:2696:18: error: format '%lu' expects argument of type
'long unsigned int', but argument 5 has type 'size_t {aka long long
unsigned int}' [-Werror=format=]
         qemu_log("%d@%zu.%06zu:e1000_receiver_overrun " "Receiver
overrun: dropped packet of %lu bytes, RDH=%u, RDT=%u" "\n",
                  ^

which means it won't compile on 32-bit hosts.

thanks
-- PMM

On 2018/10/15 下午9:20, Peter Maydell wrote:
> On 15 October 2018 at 09:46, Jason Wang <jasowang@redhat.com> wrote:
>> The following changes since commit a73549f99612f758dec0fdea6ae1c30b6c709a0b:
>>
>>    Merge remote-tracking branch 'remotes/kraxel/tags/ui-20181012-pull-request' into staging (2018-10-12 16:45:51 +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 a7ec0077c2db445d6bae421963188367d2695bd6:
>>
>>    qemu-options: Fix bad "macaddr" property in the documentation (2018-10-15 16:14:15 +0800)
>>
>> ----------------------------------------------------------------
>>
>> ----------------------------------------------------------------
> Hi; there seems to be a format string issue in this pullreq:
>
> In file included from hw/net/trace.c:4:0:
> hw/net/trace.h: In function '_nocheck__trace_e1000_receiver_overrun':
> hw/net/trace.h:2696:18: error: format '%lu' expects argument of type
> 'long unsigned int', but argument 5 has type 'size_t {aka long long
> unsigned int}' [-Werror=format=]
>           qemu_log("%d@%zu.%06zu:e1000_receiver_overrun " "Receiver
> overrun: dropped packet of %lu bytes, RDH=%u, RDT=%u" "\n",
>                    ^
>
> which means it won't compile on 32-bit hosts.
>
> thanks
> -- PMM


Sorry, will post V2.

Thanks