From: Peter Maydell Date: Fri, 11 Jun 2021 08:21:48 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging X-Git-Tag: v6.1.0-rc0~78 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=894fc4fd670aaf04a67dc7507739f914ff4bacf2;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging # gpg: Signature made Fri 11 Jun 2021 03:54:51 BST # gpg: using RSA key EF04965B398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) " [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: Fixed calculation error of pkt->header_size in fill_pkt_tcp_info() Add the function of colo_compare_cleanup Add a function named packet_new_nocopy for COLO. Remove migrate_set_block_enabled in checkpoint Optimize the function of filter_send Fix the qemu crash when guest shutdown during checkpoint Remove some duplicate trace code. netdev: add more commands to preconfig mode vhost-vdpa: remove the unused vhost_vdpa_get_acked_features() vhost-vdpa: don't initialize backend_features vhost-vdpa: map virtqueue notification area if possible vhost-vdpa: skip ram device from the IOTLB mapping Signed-off-by: Peter Maydell --- 894fc4fd670aaf04a67dc7507739f914ff4bacf2