The following changes since commit b6179aaff961627fcb59d7b234297966b81ac726:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20190304' into staging (2019-03-04 16:50:41 +0000)

are available in the git repository at:

  https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to 4b9b70000218640a42c3ea908a12665e5840b6cd:

  tests: Add a test for qemu self announcements (2019-03-05 11:27:41 +0800)

----------------------------------------------------------------

Changes from V1:
- build fixes for qmp controlled announcing

----------------------------------------------------------------
Dr. David Alan Gilbert (9):
      net: Introduce announce timer
      migration: Add announce parameters
      virtio-net: Switch to using announce timer
      migration: Switch to using announce timer
      net: Add a network device specific self-announcement ability
      virtio-net: Allow qemu_announce_self to trigger virtio announcements
      qmp: Add announce-self command
      hmp: Add hmp_announce_self
      tests: Add a test for qemu self announcements

Vincenzo Maffione (3):
      net: netmap: small improvements netmap_send()
      net: netmap: simplify netmap_receive()
      net: netmap: improve netmap_receive_iov()

Zhang Chen (1):
      net/colo-compare.c: Remove duplicated code

 hmp-commands.hx                |  16 +++++
 hmp.c                          |  33 ++++++++++
 hmp.h                          |   1 +
 hw/net/trace-events            |   6 ++
 hw/net/virtio-net.c            |  69 +++++++++++++++-----
 include/hw/virtio/virtio-net.h |   4 +-
 include/migration/misc.h       |  12 +---
 include/net/announce.h         |  41 ++++++++++++
 include/net/net.h              |   2 +
 include/qemu/typedefs.h        |   1 +
 include/sysemu/sysemu.h        |   2 -
 migration/migration.c          | 103 +++++++++++++++++++++++++++++-
 migration/migration.h          |   4 ++
 migration/savevm.c             |  72 +--------------------
 migration/trace-events         |   1 -
 net/Makefile.objs              |   1 +
 net/announce.c                 | 140 +++++++++++++++++++++++++++++++++++++++++
 net/colo-compare.c             |   8 ---
 net/netmap.c                   | 110 ++++++++++++++------------------
 net/trace-events               |   3 +
 qapi/migration.json            |  53 +++++++++++++++-
 qapi/net.json                  |  43 +++++++++++++
 tests/Makefile.include         |   3 +
 tests/test-announce-self.c     |  82 ++++++++++++++++++++++++
 tests/test-hmp.c               |   1 +
 25 files changed, 637 insertions(+), 174 deletions(-)
 create mode 100644 include/net/announce.h
 create mode 100644 net/announce.c
 create mode 100644 tests/test-announce-self.c

On Tue, 5 Mar 2019 at 07:12, Jason Wang <jasowang@redhat.com> wrote:
>
> The following changes since commit b6179aaff961627fcb59d7b234297966b81ac726:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20190304' into staging (2019-03-04 16:50:41 +0000)
>
> are available in the git repository at:
>
>   https://github.com/jasowang/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 4b9b70000218640a42c3ea908a12665e5840b6cd:
>
>   tests: Add a test for qemu self announcements (2019-03-05 11:27:41 +0800)
>
> ----------------------------------------------------------------
>
> Changes from V1:
> - build fixes for qmp controlled announcing
>

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
for any user-visible changes.

-- PMM

On 2019/3/5 下午7:21, Peter Maydell wrote:
> On Tue, 5 Mar 2019 at 07:12, Jason Wang <jasowang@redhat.com> wrote:
>> The following changes since commit b6179aaff961627fcb59d7b234297966b81ac726:
>>
>>    Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20190304' into staging (2019-03-04 16:50:41 +0000)
>>
>> are available in the git repository at:
>>
>>    https://github.com/jasowang/qemu.git tags/net-pull-request
>>
>> for you to fetch changes up to 4b9b70000218640a42c3ea908a12665e5840b6cd:
>>
>>    tests: Add a test for qemu self announcements (2019-03-05 11:27:41 +0800)
>>
>> ----------------------------------------------------------------
>>
>> Changes from V1:
>> - build fixes for qmp controlled announcing
>>
> Applied, thanks.
>
> Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
> for any user-visible changes.
>
> -- PMM


Done.

Thanks