From 60967ef1ac6254e710cc913fb8430c86a696dd02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 22 Jun 2022 19:10:47 +0400 Subject: Fix vmstate regression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit e7362700b ("msvc: enable vmstate code on !gnuc") forgot to remove HAVE_VMSTATE condition... Signed-off-by: Marc-André Lureau --- src/state.c | 15 --------------- src/vmstate.c | 4 ---- 2 files changed, 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 */ -- cgit v1.1