[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/8] slirp: VMStatify socket level
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH 7/8] slirp: VMStatify socket level |
Date: |
Thu, 27 Oct 2016 16:32:16 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
Working up the stack, this replaces the slirp_socket_load/save
with VMState definitions.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
slirp/slirp.c | 150 +++++++++++++++++++++++++++------------------------------
slirp/socket.h | 6 +--
2 files changed, 74 insertions(+), 82 deletions(-)
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 2f7802e..d9532d6 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -1250,40 +1250,81 @@ static const VMStateDescription vmstate_slirp_sbuf = {
}
};
+static bool slirp_older_than_v4(void *opaque, int version_id)
+{
+ return version_id < 4;
+}
-static void slirp_socket_save(QEMUFile *f, struct socket *so)
+static bool slirp_v4_or_newer_ffamily_inet(void *opaque, int version_id)
{
- qemu_put_be32(f, so->so_urgc);
- qemu_put_be16(f, so->so_ffamily);
- switch (so->so_ffamily) {
- case AF_INET:
- qemu_put_be32(f, so->so_faddr.s_addr);
- qemu_put_be16(f, so->so_fport);
- break;
- default:
- error_report("so_ffamily unknown, unable to save so_faddr and"
- " so_fport");
+ bool is_inet = ((struct socket *)opaque)->so_ffamily == AF_INET;
+ if (version_id >= 4 && !is_inet) {
+ error_report("%s: so_ffamily unknown, socket not preserved", __func__);
}
- qemu_put_be16(f, so->so_lfamily);
- switch (so->so_lfamily) {
- case AF_INET:
- qemu_put_be32(f, so->so_laddr.s_addr);
- qemu_put_be16(f, so->so_lport);
- break;
- default:
- error_report("so_ffamily unknown, unable to save so_laddr and"
- " so_lport");
+ return version_id >= 4 && is_inet;
+}
+
+static bool slirp_v4_or_newer_lfamily_inet(void *opaque, int version_id)
+{
+ bool is_inet = ((struct socket *)opaque)->so_lfamily == AF_INET;
+ if (version_id >= 4 && !is_inet) {
+ error_report("%s: so_lfamily unknown, socket not preserved", __func__);
}
- qemu_put_byte(f, so->so_iptos);
- qemu_put_byte(f, so->so_emu);
- qemu_put_byte(f, so->so_type);
- qemu_put_be32(f, so->so_state);
- /* TODO: Build vmstate at this level */
- vmstate_save_state(f, &vmstate_slirp_sbuf, &so->so_rcv, 0);
- vmstate_save_state(f, &vmstate_slirp_sbuf, &so->so_snd, 0);
- vmstate_save_state(f, &vmstate_slirp_tcp, so->so_tcpcb, 0);
+ return version_id >= 4 && is_inet;
+}
+
+static int slirp_socket_pre_load(void *opaque)
+{
+ struct socket *so = opaque;
+ if (tcp_attach(so) < 0) {
+ return -ENOMEM;
+ }
+ /* Older versions don't load these fields */
+ so->so_ffamily = AF_INET;
+ so->so_lfamily = AF_INET;
+ return 0;
}
+static const VMStateDescription vmstate_slirp_socket = {
+ .name = "slirp-socket",
+ .version_id = 4,
+ .pre_load = slirp_socket_pre_load,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(so_urgc, struct socket),
+ /* Pre-v4 versions */
+ VMSTATE_UINT32_TEST(so_faddr.s_addr, struct socket,
+ slirp_older_than_v4),
+ VMSTATE_UINT32_TEST(so_laddr.s_addr, struct socket,
+ slirp_older_than_v4),
+ VMSTATE_UINT16_TEST(so_fport, struct socket, slirp_older_than_v4),
+ VMSTATE_UINT16_TEST(so_lport, struct socket, slirp_older_than_v4),
+ /* v4 and newer - note the order difference as well as extras */
+ VMSTATE_UINT16_V(so_ffamily, struct socket, 4),
+ VMSTATE_UINT32_TEST(so_faddr.s_addr, struct socket,
+ slirp_v4_or_newer_ffamily_inet),
+ VMSTATE_UINT16_TEST(so_fport, struct socket,
+ slirp_v4_or_newer_ffamily_inet),
+
+ VMSTATE_UINT16_V(so_lfamily, struct socket, 4),
+ VMSTATE_UINT32_TEST(so_laddr.s_addr, struct socket,
+ slirp_v4_or_newer_lfamily_inet),
+ VMSTATE_UINT16_TEST(so_lport, struct socket,
+ slirp_v4_or_newer_lfamily_inet),
+
+ VMSTATE_UINT8(so_iptos, struct socket),
+ VMSTATE_UINT8(so_emu, struct socket),
+ VMSTATE_UINT8(so_type, struct socket),
+ VMSTATE_INT32(so_state, struct socket),
+ VMSTATE_STRUCT(so_rcv, struct socket, 0, vmstate_slirp_sbuf,
+ struct sbuf),
+ VMSTATE_STRUCT(so_snd, struct socket, 0, vmstate_slirp_sbuf,
+ struct sbuf),
+ VMSTATE_STRUCT_POINTER(so_tcpcb, struct socket, vmstate_slirp_tcp,
+ struct tcpcb),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static void slirp_bootp_save(QEMUFile *f, Slirp *slirp)
{
int i;
@@ -1308,7 +1349,7 @@ static void slirp_state_save(QEMUFile *f, void *opaque)
continue;
qemu_put_byte(f, 42);
- slirp_socket_save(f, so);
+ vmstate_save_state(f, &vmstate_slirp_socket, so, NULL);
}
qemu_put_byte(f, 0);
@@ -1317,55 +1358,6 @@ static void slirp_state_save(QEMUFile *f, void *opaque)
slirp_bootp_save(f, slirp);
}
-static int slirp_socket_load(QEMUFile *f, struct socket *so, int version_id)
-{
- int ret = 0;
- if (tcp_attach(so) < 0)
- return -ENOMEM;
-
- so->so_urgc = qemu_get_be32(f);
- if (version_id <= 3) {
- so->so_ffamily = AF_INET;
- so->so_faddr.s_addr = qemu_get_be32(f);
- so->so_laddr.s_addr = qemu_get_be32(f);
- so->so_fport = qemu_get_be16(f);
- so->so_lport = qemu_get_be16(f);
- } else {
- so->so_ffamily = qemu_get_be16(f);
- switch (so->so_ffamily) {
- case AF_INET:
- so->so_faddr.s_addr = qemu_get_be32(f);
- so->so_fport = qemu_get_be16(f);
- break;
- default:
- error_report(
- "so_ffamily unknown, unable to restore so_faddr and so_lport");
- }
- so->so_lfamily = qemu_get_be16(f);
- switch (so->so_lfamily) {
- case AF_INET:
- so->so_laddr.s_addr = qemu_get_be32(f);
- so->so_lport = qemu_get_be16(f);
- break;
- default:
- error_report(
- "so_ffamily unknown, unable to restore so_laddr and so_lport");
- }
- }
- so->so_iptos = qemu_get_byte(f);
- so->so_emu = qemu_get_byte(f);
- so->so_type = qemu_get_byte(f);
- so->so_state = qemu_get_be32(f);
- /* TODO: VMState at this level */
- ret = vmstate_load_state(f, &vmstate_slirp_sbuf, &so->so_rcv, 0);
- if (!ret) {
- ret = vmstate_load_state(f, &vmstate_slirp_sbuf, &so->so_snd, 0);
- }
- if (!ret) {
- ret = vmstate_load_state(f, &vmstate_slirp_tcp, so->so_tcpcb, 0);
- }
- return ret;
-}
static void slirp_bootp_load(QEMUFile *f, Slirp *slirp)
{
@@ -1389,7 +1381,7 @@ static int slirp_state_load(QEMUFile *f, void *opaque,
int version_id)
if (!so)
return -ENOMEM;
- ret = slirp_socket_load(f, so, version_id);
+ ret = vmstate_load_state(f, &vmstate_slirp_socket, so, version_id);
if (ret < 0)
return ret;
diff --git a/slirp/socket.h b/slirp/socket.h
index 8feed2a..0137928 100644
--- a/slirp/socket.h
+++ b/slirp/socket.h
@@ -30,7 +30,7 @@ struct socket {
* PING reply's */
struct tcpiphdr *so_ti; /* Pointer to the original ti within
* so_mconn, for non-blocking connections */
- int so_urgc;
+ uint32_t so_urgc;
union { /* foreign host */
struct sockaddr_storage ss;
struct sockaddr_in sin;
@@ -56,8 +56,8 @@ struct socket {
uint8_t so_iptos; /* Type of service */
uint8_t so_emu; /* Is the socket emulated? */
- u_char so_type; /* Type of socket, UDP or TCP */
- int so_state; /* internal state flags SS_*, below */
+ uint8_t so_type; /* Type of socket, UDP or TCP */
+ int32_t so_state; /* internal state flags SS_*, below */
struct tcpcb *so_tcpcb; /* pointer to TCP protocol control
block */
u_int so_expire; /* When the socket will expire */
--
2.9.3
- [Qemu-devel] [PATCH 0/8] VMSTATE_WITH_TMP and it's use in SLIRP, Dr. David Alan Gilbert (git), 2016/10/27
- [Qemu-devel] [PATCH 2/8] add QEMU_BUILD_BUG_EXPR, Dr. David Alan Gilbert (git), 2016/10/27
- [Qemu-devel] [PATCH 4/8] tests/migration: Add test for VMSTATE_WITH_TMP, Dr. David Alan Gilbert (git), 2016/10/27
- [Qemu-devel] [PATCH 3/8] migration: Add VMSTATE_WITH_TMP, Dr. David Alan Gilbert (git), 2016/10/27
- [Qemu-devel] [PATCH 1/8] migration: extend VMStateInfo, Dr. David Alan Gilbert (git), 2016/10/27
- [Qemu-devel] [PATCH 8/8] slirp: VMStatify remaining except for loop, Dr. David Alan Gilbert (git), 2016/10/27
- [Qemu-devel] [PATCH 5/8] slirp: VMState conversion; tcpcb, Dr. David Alan Gilbert (git), 2016/10/27
- [Qemu-devel] [PATCH 7/8] slirp: VMStatify socket level,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PATCH 6/8] slirp: VMStatify sbuf, Dr. David Alan Gilbert (git), 2016/10/27