From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzmfU-0006Dn-Cp for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:32:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzmfR-0001wN-RU for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:32:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57558) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzmfR-0001vo-Mb for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:32:33 -0400 From: "Dr. David Alan Gilbert (git)" Date: Thu, 27 Oct 2016 16:32:17 +0100 Message-Id: <20161027153217.16984-9-dgilbert@redhat.com> In-Reply-To: <20161027153217.16984-1-dgilbert@redhat.com> References: <20161027153217.16984-1-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH 8/8] slirp: VMStatify remaining except for loop List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, quintela@redhat.com, amit.shah@redhat.com, samuel.thibault@ens-lyon.org, jan.kiszka@siemens.com Cc: duanj@linux.vnet.ibm.com From: "Dr. David Alan Gilbert" This converts the remaining components, except for the loop, to VMState. Signed-off-by: Dr. David Alan Gilbert --- slirp/slirp.c | 49 ++++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/slirp/slirp.c b/slirp/slirp.c index d9532d6..efb3476 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -1325,15 +1325,26 @@ static const VMStateDescription vmstate_slirp_socket = { } }; -static void slirp_bootp_save(QEMUFile *f, Slirp *slirp) -{ - int i; +static const VMStateDescription vmstate_slirp_bootp_client = { + .name = "slirp_bootpclient", + .fields = (VMStateField[]) { + VMSTATE_UINT16(allocated, BOOTPClient), + VMSTATE_BUFFER(macaddr, BOOTPClient), + VMSTATE_END_OF_LIST() + } +}; - for (i = 0; i < NB_BOOTP_CLIENTS; i++) { - qemu_put_be16(f, slirp->bootp_clients[i].allocated); - qemu_put_buffer(f, slirp->bootp_clients[i].macaddr, 6); +static const VMStateDescription vmstate_slirp = { + .name = "slirp", + .version_id = 4, + .fields = (VMStateField[]) { + /* TODO: Add loop */ + 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) { @@ -1353,22 +1364,10 @@ static void slirp_state_save(QEMUFile *f, void *opaque) } qemu_put_byte(f, 0); - qemu_put_be16(f, slirp->ip_id); - - slirp_bootp_save(f, slirp); + vmstate_save_state(f, &vmstate_slirp, slirp, NULL); } -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) { Slirp *slirp = opaque; @@ -1403,13 +1402,5 @@ static int slirp_state_load(QEMUFile *f, void *opaque, int version_id) so->extra = (void *)ex_ptr->ex_exec; } - if (version_id >= 2) { - slirp->ip_id = qemu_get_be16(f); - } - - if (version_id >= 3) { - slirp_bootp_load(f, slirp); - } - - return 0; + return vmstate_load_state(f, &vmstate_slirp, slirp, version_id); } -- 2.9.3