From patchwork Thu Oct 27 18:17:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 122205 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A6FE61007D8 for ; Fri, 28 Oct 2011 05:19:18 +1100 (EST) Received: from localhost ([::1]:35324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJUXi-0004s3-HM for incoming@patchwork.ozlabs.org; Thu, 27 Oct 2011 14:19:06 -0400 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 Received: from illuin.austin.ibm.com ([32.97.110.59]) by mrelay.perfora.net (node=mrus3) with ESMTP (Nemesis) id 0MY7Me-1RWk312JsW-00VKoU; Thu, 27 Oct 2011 14:18:32 -0400 From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 27 Oct 2011 13:17:18 -0500 Message-Id: <1319739445-17629-7-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.1 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> X-Provags-ID: V02:K0:seIinph3cacNDcJDlGpikt3gdJvmAe+HtT4Xcje7Brw TGe5vR/l4x/i5IIRYaAvXEeFjWdcViSqLswuNlRS33THJ0hRFa S1VMd8U2UoF/xn8bj1/cjwwPuVxJbbwXydQwtRvHwU8+R/QY/3 Bs7QJD6Yq82VEYJfy26WzjNLLEpKLZMP8dWKhrzj7MpKF+QdM5 ssjdkM4BCxSYPM1vh+WaamRokt1efDw25QXfwvrTJ8UqD+rxlY pa4bt0cmXlOvFJxkiTlbpe3dtBS8DQRgaOSwmHge98oKCxSjpJ tM+ZoSPsnR8B+TFwY5WNlOsx4Awz0/JSvOjsRa/DZRdbnTqwub SQCDuffBKp+BtfAsAwa2ramR1Ss4mX1amTrRL8UBXLaLoY7CPl 7/6ugvLK8kHFz2MmVzCG3zbT8uC761ZEgQ= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.208.4.195 Cc: aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 06/13] i440fx: convert save/load to visitors X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)