diff options
| author | Peter Maydell | 2018-03-26 12:02:50 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-03-26 12:02:50 +0200 |
| commit | 2ffd221d07a671f72354a063d3080f244ec80b20 (patch) | |
| tree | d690ef5304a7ee5edde9c00286c775dfcb796d78 /include | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180323'... (diff) | |
| parent | net/vde: print error on vde_open() failure (diff) | |
| download | qemu-2ffd221d07a671f72354a063d3080f244ec80b20.tar.gz qemu-2ffd221d07a671f72354a063d3080f244ec80b20.tar.xz qemu-2ffd221d07a671f72354a063d3080f244ec80b20.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 26 Mar 2018 07:53:27 BST
# gpg: using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# 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:
net/vde: print error on vde_open() failure
virtio_net: flush uncompleted TX on reset
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/net.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/net.h b/include/net/net.h index a943e968a3..1f7341e459 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -153,6 +153,7 @@ ssize_t qemu_send_packet_async(NetClientState *nc, const uint8_t *buf, int size, NetPacketSent *sent_cb); void qemu_purge_queued_packets(NetClientState *nc); void qemu_flush_queued_packets(NetClientState *nc); +void qemu_flush_or_purge_queued_packets(NetClientState *nc, bool purge); void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6]); bool qemu_has_ufo(NetClientState *nc); bool qemu_has_vnet_hdr(NetClientState *nc); |