aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2020-01-30 10:27:36 +0000
committerMarc-André Lureau <marcandre.lureau@gmail.com>2020-01-30 10:27:36 +0000
commit00ea58dcaba26863807c7a02a9f3666104b7f1a1 (patch)
tree6f4368de03da821ae0ad7bd3417e01094b9f682b
parent68ccb8021a838066f0951d4b2817eb6b6f10a843 (diff)
parent8604ed80690d80825408df751afcdf3d7565d8e5 (diff)
downloadslirp-00ea58dcaba26863807c7a02a9f3666104b7f1a1.zip
slirp-00ea58dcaba26863807c7a02a9f3666104b7f1a1.tar.gz
slirp-00ea58dcaba26863807c7a02a9f3666104b7f1a1.tar.bz2
Merge branch 'aw-guestfwd-state' into 'master'
Fix loading of guestfwd state Unsure how testing usually is done for changes in this project. I have built qemu with this change and it fixes the bug in my setup (testbed where a system is booted a snapshot is created, and then that snapshot is restored many times to run different tests. Outbound syslog uses a guestfwd to a qemu chardev) See merge request slirp/libslirp!29
-rw-r--r--src/state.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/state.c b/src/state.c
index 12e607e..22af77b 100644
--- a/src/state.c
+++ b/src/state.c
@@ -366,6 +366,8 @@ int slirp_state_load(Slirp *slirp, int version_id, SlirpReadCb read_cb,
if (!ex_ptr) {
return -EINVAL;
}
+
+ so->guestfwd = ex_ptr;
}
return slirp_vmstate_load_state(&f, &vmstate_slirp, slirp, version_id);