[Qemu-commits] [qemu/qemu] 6d3aaa: net/colo-compare.c: Remove duplicated code

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 6d3aaa5b255ffc55a0561d359159fdaaccf09b31
      
https://github.com/qemu/qemu/commit/6d3aaa5b255ffc55a0561d359159fdaaccf09b31
  Author: Zhang Chen <address@hidden>
  Date:   2019-03-05 (Tue, 05 Mar 2019)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  net/colo-compare.c: Remove duplicated code

Fix duplicated code:
https://bugs.launchpad.net/qemu/+bug/1811499

Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: cc599ed6d46250b2178eca1a06a4602acd83b706
      
https://github.com/qemu/qemu/commit/cc599ed6d46250b2178eca1a06a4602acd83b706
  Author: Vincenzo Maffione <address@hidden>
  Date:   2019-03-05 (Tue, 05 Mar 2019)

  Changed paths:
    M net/netmap.c

  Log Message:
  -----------
  net: netmap: small improvements netmap_send()

This change improves the handling of incomplete multi-slot packets
(e.g. with the NS_MOREFRAG set), by advancing ring->head only on
complete packets. The ring->cur pointer is advanced in any case in
order to acknowledge the kernel and move the wake-up point (thus
avoiding repeated wake-ups).
Also don't be verbose when incomplete packets are found.

Signed-off-by: Vincenzo Maffione <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: c7cbb6b48fc2dbfeeb4c126ee4b909220a418fb0
      
https://github.com/qemu/qemu/commit/c7cbb6b48fc2dbfeeb4c126ee4b909220a418fb0
  Author: Vincenzo Maffione <address@hidden>
  Date:   2019-03-05 (Tue, 05 Mar 2019)

  Changed paths:
    M net/netmap.c

  Log Message:
  -----------
  net: netmap: simplify netmap_receive()

Improve code reuse by implementing netmap_receive() with a call
to netmap_receive_iov().

Signed-off-by: Vincenzo Maffione <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 4875bf140662b214ad9f94b0d566354977d8c01d
      
https://github.com/qemu/qemu/commit/4875bf140662b214ad9f94b0d566354977d8c01d
  Author: Vincenzo Maffione <address@hidden>
  Date:   2019-03-05 (Tue, 05 Mar 2019)

  Changed paths:
    M net/netmap.c

  Log Message:
  -----------
  net: netmap: improve netmap_receive_iov()

Changes:
  - Save CPU cycles by computing the return value while scanning the
    input iovec, rather than calling iov_size() at the end.
  - Remove check for s->tx != NULL, because it cannot happen.
  - Cache ring->tail in a local variable and use it to check for
    space in the TX ring. The use of nm_ring_empty() was invalid,
    because nobody is updating ring->cur and ring->head at that point.
  - In case we run out of netmap slots in the middle of a packet,
    move the wake-up point by advancing ring->cur, but do not
    expose the incomplete packet (i.e., by updating also ring->head).

Signed-off-by: Vincenzo Maffione <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 50510ea2c2960cc48e9cc1676dde88b849933b6e
      
https://github.com/qemu/qemu/commit/50510ea2c2960cc48e9cc1676dde88b849933b6e
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-03-05 (Tue, 05 Mar 2019)

  Changed paths:
    A include/net/announce.h
    M include/qemu/typedefs.h
    M migration/migration.c
    M net/Makefile.objs
    A net/announce.c
    M qapi/net.json

  Log Message:
  -----------
  net: Introduce announce timer

The 'announce timer' will be used by migration, and explicit
requests for qemu to perform network announces.

Based on the work by Germano Veit Michel <address@hidden>
 and Vlad Yasevich <address@hidden>

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: ee3d96baf32350dd273643bd220bc180c62923cf
      
https://github.com/qemu/qemu/commit/ee3d96baf32350dd273643bd220bc180c62923cf
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-03-05 (Tue, 05 Mar 2019)

  Changed paths:
    M hmp.c
    M include/migration/misc.h
    M migration/migration.c
    M qapi/migration.json

  Log Message:
  -----------
  migration: Add announce parameters

Add migration parameters that control RARP/GARP announcement timeouts.

Based on earlier patches by myself and
  Vladislav Yasevich <address@hidden>

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Acked-by: Markus Armbruster <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 9d8c6a258c70d8ff494489140a4fcb3a965909b2
      
https://github.com/qemu/qemu/commit/9d8c6a258c70d8ff494489140a4fcb3a965909b2
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-03-05 (Tue, 05 Mar 2019)

  Changed paths:
    M hw/net/trace-events
    M hw/net/virtio-net.c
    M include/hw/virtio/virtio-net.h

  Log Message:
  -----------
  virtio-net: Switch to using announce timer

Switch virtio's self announcement to use the AnnounceTimer.
It keeps it's own AnnounceTimer (per device), and starts running it
using a migration post-load and a virtual clock; that way the
announce happens once the guest is actually running.
The timer uses the migration parameters to set the timing of
the repeats.

Based on earlier patches by myself and
 Vladislav Yasevich <address@hidden>

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 7659505c1680643d13ad7675f9e649d388303059
      
https://github.com/qemu/qemu/commit/7659505c1680643d13ad7675f9e649d388303059
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-03-05 (Tue, 05 Mar 2019)

  Changed paths:
    M include/migration/misc.h
    M include/net/announce.h
    M include/sysemu/sysemu.h
    M migration/migration.c
    M migration/migration.h
    M migration/savevm.c
    M migration/trace-events
    M net/announce.c
    M net/trace-events

  Log Message:
  -----------
  migration: Switch to using announce timer

Switch the announcements to using the new announce timer.
Move the code that does it to announce.c rather than savevm
because it really has nothing to do with the actual migration.

Migration starts the announce from bh's and so they're all
in the main thread/bql, and so there's never any racing with
the timers themselves.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 44b416ad62bf1068a9653fe066bd500fb9b0d88f
      
https://github.com/qemu/qemu/commit/44b416ad62bf1068a9653fe066bd500fb9b0d88f
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-03-05 (Tue, 05 Mar 2019)

  Changed paths:
    M include/net/net.h
    M net/announce.c

  Log Message:
  -----------
  net: Add a network device specific self-announcement ability

Some network devices have a capability to do self announcements
(ex: virtio-net).  Add infrastructure that would allow devices
to expose this ability.

Signed-off-by: Vladislav Yasevich <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: b2c929f02ba37b206144735313af10fb9cc5d1a4
      
https://github.com/qemu/qemu/commit/b2c929f02ba37b206144735313af10fb9cc5d1a4
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-03-05 (Tue, 05 Mar 2019)

  Changed paths:
    M hw/net/trace-events
    M hw/net/virtio-net.c

  Log Message:
  -----------
  virtio-net: Allow qemu_announce_self to trigger virtio announcements

Expose the virtio-net self announcement capability and allow
qemu_announce_self() to call it.

These announces are caused by something external (i.e. the
announce-self command); they won't trigger if the migration
counter is triggering announces at the same time.

Signed-off-by: Vladislav Yasevich <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: a06cd488d83963faa4e7c1b8314c55f1e8f605e6
      
https://github.com/qemu/qemu/commit/a06cd488d83963faa4e7c1b8314c55f1e8f605e6
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-03-05 (Tue, 05 Mar 2019)

  Changed paths:
    M net/announce.c
    M qapi/net.json

  Log Message:
  -----------
  qmp: Add announce-self command

Add a qmp command that can trigger guest announcements.

It uses its own announce-timer instance, and parameters
passed to it explicitly in the command.

Like most qmp commands, it's in the main thread/bql, so
there's no racing with any outstanding timer.

Based on work of Germano Veit Michel <address@hidden> and
                 Vladislav Yasevich <address@hidden>

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 544f6ea324970dba5b8417e0033e00e4dc5ea14c
      
https://github.com/qemu/qemu/commit/544f6ea324970dba5b8417e0033e00e4dc5ea14c
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-03-05 (Tue, 05 Mar 2019)

  Changed paths:
    M hmp-commands.hx
    M hmp.c
    M hmp.h
    M tests/test-hmp.c

  Log Message:
  -----------
  hmp: Add hmp_announce_self

Add an HMP command to trigger self annocements.
Unlike the QMP command (which takes a set of parameters), the HMP
command reuses the set of parameters used for migration.

Signend-off-by: Vladislav Yasevich <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 4b9b70000218640a42c3ea908a12665e5840b6cd
      
https://github.com/qemu/qemu/commit/4b9b70000218640a42c3ea908a12665e5840b6cd
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-03-05 (Tue, 05 Mar 2019)

  Changed paths:
    M tests/Makefile.include
    A tests/test-announce-self.c

  Log Message:
  -----------
  tests: Add a test for qemu self announcements

We now expose qemu_announce_self through QMP and HMP.  Add a test
with some very basic packet validation (make sure we get a RARP).

Signed-off-by: Vlad Yasevich <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 0984a157c1c053394adbf64ed7de97f1aebe6a2d
      
https://github.com/qemu/qemu/commit/0984a157c1c053394adbf64ed7de97f1aebe6a2d
  Author: Peter Maydell <address@hidden>
  Date:   2019-03-05 (Tue, 05 Mar 2019)

  Changed paths:
    M hmp-commands.hx
    M hmp.c
    M hmp.h
    M hw/net/trace-events
    M hw/net/virtio-net.c
    M include/hw/virtio/virtio-net.h
    M include/migration/misc.h
    A include/net/announce.h
    M include/net/net.h
    M include/qemu/typedefs.h
    M include/sysemu/sysemu.h
    M migration/migration.c
    M migration/migration.h
    M migration/savevm.c
    M migration/trace-events
    M net/Makefile.objs
    A net/announce.c
    M net/colo-compare.c
    M net/netmap.c
    M net/trace-events
    M qapi/migration.json
    M qapi/net.json
    M tests/Makefile.include
    A tests/test-announce-self.c
    M tests/test-hmp.c

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

# gpg: Signature made Tue 05 Mar 2019 07:06:28 GMT
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <address@hidden>" 
[marginal]
# 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:
  tests: Add a test for qemu self announcements
  hmp: Add hmp_announce_self
  qmp: Add announce-self command
  virtio-net: Allow qemu_announce_self to trigger virtio announcements
  net: Add a network device specific self-announcement ability
  migration: Switch to using announce timer
  virtio-net: Switch to using announce timer
  migration: Add announce parameters
  net: Introduce announce timer
  net: netmap: improve netmap_receive_iov()
  net: netmap: simplify netmap_receive()
  net: netmap: small improvements netmap_send()
  net/colo-compare.c: Remove duplicated code

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/b6179aaff961...0984a157c1c0