From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJUXC-0003pV-UD for qemu-devel@nongnu.org; Thu, 27 Oct 2011 14:18:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJUXB-0000MM-JO for qemu-devel@nongnu.org; Thu, 27 Oct 2011 14:18:34 -0400 Received: from mout.perfora.net ([74.208.4.195]:52993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJUXB-0000MD-Es for qemu-devel@nongnu.org; Thu, 27 Oct 2011 14:18:33 -0400 From: Michael Roth Date: Thu, 27 Oct 2011 13:17:18 -0500 Message-Id: <1319739445-17629-7-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1319739445-17629-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1319739445-17629-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 06/13] i440fx: convert save/load to visitors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com, quintela@redhat.com Signed-off-by: Michael Roth --- hw/piix_pci.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/hw/piix_pci.c b/hw/piix_pci.c index d183443..0e405f3 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -195,20 +195,35 @@ static int i440fx_load_old(QEMUFile* f, void *opaque, int version_id) { PCII440FXState *d = opaque; int ret, i; + uint32_t dummy; + Visitor *v = qemu_file_get_visitor(f); + Error *err = NULL; + + visit_start_struct(v, NULL, NULL, "i440fx", 0, &err); ret = pci_device_load(&d->dev, f); - if (ret < 0) - return ret; + if (ret < 0) { + goto out; + } i440fx_update_memory_mappings(d); - qemu_get_8s(f, &d->smm_enabled); + visit_type_uint8(v, &d->smm_enabled, "smm_enabled", &err); if (version_id == 2) { + visit_start_array(v, NULL, "dummy_irqs", PIIX_NUM_PIRQS, 4, &err); for (i = 0; i < PIIX_NUM_PIRQS; i++) { - qemu_get_be32(f); /* dummy load for compatibility */ + visit_type_uint32(v, &dummy, NULL, &err); /* dummy load for compatibility */ } + visit_end_array(v, &err); } - return 0; + visit_end_struct(v, &err); + +out: + if (err) { + error_report("error loading i440fx state: %s", error_get_pretty(err)); + error_free(err); + } + return ret; } static int i440fx_post_load(void *opaque, int version_id) -- 1.7.4.1