diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-06-22 19:10:47 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-06-22 19:38:56 +0400 |
| commit | 60967ef1ac6254e710cc913fb8430c86a696dd02 (patch) | |
| tree | eb37fd68b1514d0517b2de5363f6766bc0a4fc3e | |
| parent | 88b10e6bfb5bb4d58d09a61ee7d0452183be6529 (diff) | |
| download | slirp-60967ef1ac6254e710cc913fb8430c86a696dd02.zip slirp-60967ef1ac6254e710cc913fb8430c86a696dd02.tar.gz slirp-60967ef1ac6254e710cc913fb8430c86a696dd02.tar.bz2 | |
Fix vmstate regression
Commit e7362700b ("msvc: enable vmstate code on !gnuc") forgot to remove
HAVE_VMSTATE condition...
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
| -rw-r--r-- | src/state.c | 15 | ||||
| -rw-r--r-- | src/vmstate.c | 4 |
2 files changed, 0 insertions, 19 deletions
diff --git a/src/state.c b/src/state.c index d5689ba..f10edf0 100644 --- a/src/state.c +++ b/src/state.c @@ -26,8 +26,6 @@ #include "vmstate.h" #include "stream.h" -#ifdef HAVE_VMSTATE - static int slirp_tcp_post_load(void *opaque, int version) { tcp_template((struct tcpcb *)opaque); @@ -377,19 +375,6 @@ int slirp_state_load(Slirp *slirp, int version_id, SlirpReadCb read_cb, return slirp_vmstate_load_state(&f, &vmstate_slirp, slirp, version_id); } -#else /* HAVE_VMSTATE */ -int slirp_state_save(Slirp *slirp, SlirpWriteCb write_cb, void *opaque) -{ - return -ENOSYS; -} - -int slirp_state_load(Slirp *slirp, int version_id, SlirpReadCb read_cb, - void *opaque) -{ - return -ENOSYS; -} -#endif /* HAVE_VMSTATE */ - int slirp_state_version(void) { return 4; diff --git a/src/vmstate.c b/src/vmstate.c index be16683..2c3a727 100644 --- a/src/vmstate.c +++ b/src/vmstate.c @@ -45,8 +45,6 @@ #include "stream.h" #include "vmstate.h" -#ifdef HAVE_VMSTATE - static int get_nullptr(SlirpIStream *f, void *pv, size_t size, const VMStateField *field) { @@ -445,5 +443,3 @@ int slirp_vmstate_load_state(SlirpIStream *f, const VMStateDescription *vmsd, } return ret; } - -#endif /* HAVE_VMSTATE */ |