david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slirp: VMStatify remaining except for loop

Browse Source 
This converts the remaining components, except for the top level
loop, to VMState.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Dr. David Alan Gilbert 2017-04-03 18:18:43 +01:00 committed by Samuel Thibault
parent 14650df402
commit eb5d4f5329
1 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
slirp/slirp.c
View File

@ -1402,15 +1402,25 @@ static const VMStateDescription vmstate_slirp_socket = {
} }
}; };
static void slirp_bootp_save(QEMUFile *f, Slirp *slirp) static const VMStateDescription vmstate_slirp_bootp_client = {
{ .name = "slirp_bootpclient",
int i; .fields = (VMStateField[]) {
VMSTATE_UINT16(allocated, BOOTPClient),
for (i = 0; i < NB_BOOTP_CLIENTS; i++) { VMSTATE_BUFFER(macaddr, BOOTPClient),
qemu_put_be16(f, slirp->bootp_clients[i].allocated); VMSTATE_END_OF_LIST()
qemu_put_buffer(f, slirp->bootp_clients[i].macaddr, 6);
} }
} };
static const VMStateDescription vmstate_slirp = {
.name = "slirp",
.version_id = 4,
.fields = (VMStateField[]) {
VMSTATE_UINT16_V(ip_id, Slirp, 2),
VMSTATE_STRUCT_ARRAY(bootp_clients, Slirp, NB_BOOTP_CLIENTS, 3,
vmstate_slirp_bootp_client, BOOTPClient),
VMSTATE_END_OF_LIST()
}
};
static void slirp_state_save(QEMUFile *f, void *opaque) static void slirp_state_save(QEMUFile *f, void *opaque)
{ {
@ -1430,22 +1440,10 @@ static void slirp_state_save(QEMUFile *f, void *opaque)
} }
qemu_put_byte(f, 0); qemu_put_byte(f, 0);
qemu_put_be16(f, slirp->ip_id); vmstate_save_state(f, &vmstate_slirp, slirp, NULL);
slirp_bootp_save(f, slirp);
} }
static void slirp_bootp_load(QEMUFile *f, Slirp *slirp)
{
int i;
for (i = 0; i < NB_BOOTP_CLIENTS; i++) {
slirp->bootp_clients[i].allocated = qemu_get_be16(f);
qemu_get_buffer(f, slirp->bootp_clients[i].macaddr, 6);
}
}
static int slirp_state_load(QEMUFile *f, void *opaque, int version_id) static int slirp_state_load(QEMUFile *f, void *opaque, int version_id)
{ {
Slirp *slirp = opaque; Slirp *slirp = opaque;
@ -1480,13 +1478,5 @@ static int slirp_state_load(QEMUFile *f, void *opaque, int version_id)
so->extra = (void *)ex_ptr->ex_exec; so->extra = (void *)ex_ptr->ex_exec;
} }
if (version_id >= 2) { return vmstate_load_state(f, &vmstate_slirp, slirp, version_id);
slirp->ip_id = qemu_get_be16(f);
}
if (version_id >= 3) {
slirp_bootp_load(f, slirp);
}
return 0;
} }