aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2019-03-26 22:45:51 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-03-26 22:45:51 +0000
commit84867d2079511dff4e540d19957f5372a2b08d8e (patch)
tree9ce78924af9c109aed37c4e0ebfef9406899413e
parent77b96786ddf712e1477c6e05cddb09526043faef (diff)
parent84360052880655fdf940af64df26652ad416c5f7 (diff)
downloadqemu-sparse-5409122-L86100000287847018.tar.gz
Merge "Merge cherrypicks of [934000] into emu-3.1-release" into emu-3.1-releasesparse-5409122-L86100000287847018sparse-5409122-L00300000287907618
-rw-r--r--slirp/slirp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 6c2d210928..358735e667 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -1601,6 +1601,11 @@ static int slirp_state_load(QEMUFile *f, void *opaque, int version_id)
Slirp *slirp = opaque;
struct ex_list *ex_ptr;
+ // Clean up stale connections
+ // ip_cleanup cleans up both IPv4 and IPv6 connections, and ip6_cleanup
+ // cleans up extra data structures for IPv6. (Naming is confusing.)
+ ip_cleanup(slirp);
+
while (qemu_get_byte(f)) {
int ret;
struct socket *so = socreate(slirp);