[qemu-xen master] Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging

[patchbot@xxxxxxx]

commit ee5128bb00f90dd301991d80d1db5224ce924c84
Merge: 8746309137ba470d1b2e8f5ce86ac228625db940 
a134321ef676723768973537bb9b49365ae2062e
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Thu Jul 16 13:12:05 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Thu Jul 16 13:12:05 2020 +0100

    Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into 
staging
    
    # gpg: Signature made Wed 15 Jul 2020 14:49:07 BST
    # gpg:                using RSA key EF04965B398D6211
    # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) 
<jasowang@xxxxxxxxxx>" [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:
      ftgmac100: fix dblac write test
      net: detect errors from probing vnet hdr flag for TAP devices
      net: check if the file descriptor is valid before using it
      qemu-options.hx: Clean up and fix typo for colo-compare
      net/colo-compare.c: Expose compare "max_queue_size" to users
      hw/net: Added CSO for IPv6
      virtio-net: fix removal of failover device
    
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>

 hw/net/ftgmac100.c     | 14 +++++++------
 hw/net/net_tx_pkt.c    | 15 ++++++++++---
 hw/net/virtio-net.c    |  1 +
 include/qemu/sockets.h |  1 +
 net/colo-compare.c     | 43 ++++++++++++++++++++++++++++++++++++-
 net/socket.c           |  9 ++++++--
 net/tap-bsd.c          |  2 +-
 net/tap-linux.c        |  8 ++++---
 net/tap-solaris.c      |  2 +-
 net/tap-stub.c         |  2 +-
 net/tap.c              | 50 +++++++++++++++++++++++++++++++++++--------
 net/tap_int.h          |  2 +-
 qemu-options.hx        | 33 +++++++++++++++--------------
 util/oslib-posix.c     | 26 ++++++++++++++++-------
 util/oslib-win32.c     | 57 ++++++++++++++++++++++++++++----------------------
 15 files changed, 188 insertions(+), 77 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master