From patchwork Mon Sep 14 23:08:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 33616 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id A935FB7088 for ; Tue, 15 Sep 2009 09:13:36 +1000 (EST) Received: from localhost ([127.0.0.1]:43213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MnKjl-0007NX-Q1 for incoming@patchwork.ozlabs.org; Mon, 14 Sep 2009 19:13:33 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MnKhi-0006ir-Kb for qemu-devel@nongnu.org; Mon, 14 Sep 2009 19:11:26 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MnKhe-0006i7-Td for qemu-devel@nongnu.org; Mon, 14 Sep 2009 19:11:26 -0400 Received: from [199.232.76.173] (port=58054 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MnKhe-0006i4-O1 for qemu-devel@nongnu.org; Mon, 14 Sep 2009 19:11:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34854) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MnKhe-00079t-82 for qemu-devel@nongnu.org; Mon, 14 Sep 2009 19:11:22 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8ENBLXb003933 for ; Mon, 14 Sep 2009 19:11:21 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8ENBHsn003873; Mon, 14 Sep 2009 19:11:20 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 15 Sep 2009 01:08:36 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 2/4] vmstate: add version_id argument to post_load X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- exec.c | 2 +- hw/acpi.c | 2 +- hw/cirrus_vga.c | 2 +- hw/dma.c | 2 +- hw/fdc.c | 2 +- hw/hpet.c | 2 +- hw/hw.h | 2 +- hw/piix_pci.c | 2 +- hw/serial.c | 2 +- hw/slavio_intctl.c | 2 +- hw/tcx.c | 2 +- hw/vmmouse.c | 2 +- savevm.c | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/exec.c b/exec.c index c82e767..85076e6 100644 --- a/exec.c +++ b/exec.c @@ -528,7 +528,7 @@ static int cpu_common_pre_load(void *opaque) return 0; } -static int cpu_common_post_load(void *opaque) +static int cpu_common_post_load(void *opaque, int version_id) { CPUState *env = opaque; diff --git a/hw/acpi.c b/hw/acpi.c index b14b9f4..e67da6c 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -441,7 +441,7 @@ static void pm_write_config(PCIDevice *d, pm_io_space_update((PIIX4PMState *)d); } -static int vmstate_acpi_post_load(void *opaque) +static int vmstate_acpi_post_load(void *opaque, int version_id) { PIIX4PMState *s = opaque; diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 7e95f10..004ae7d 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2955,7 +2955,7 @@ static CPUWriteMemoryFunc * const cirrus_mmio_write[3] = { /* load/save state */ -static int cirrus_post_load(void *opaque) +static int cirrus_post_load(void *opaque, int version_id) { CirrusVGAState *s = opaque; diff --git a/hw/dma.c b/hw/dma.c index f418e42..44c642e 100644 --- a/hw/dma.c +++ b/hw/dma.c @@ -517,7 +517,7 @@ static const VMStateDescription vmstate_dma_regs = { } }; -static int dma_post_load(void *opaque) +static int dma_post_load(void *opaque, int version_id) { DMA_run(); diff --git a/hw/fdc.c b/hw/fdc.c index 389d9e6..c03ab47 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -650,7 +650,7 @@ static void fdc_pre_save(const void *opaque) s->dor_vmstate = s->dor | GET_CUR_DRV(s); } -static int fdc_post_load(void *opaque) +static int fdc_post_load(void *opaque, int version_id) { fdctrl_t *s = opaque; diff --git a/hw/hpet.c b/hw/hpet.c index c1ead34..6535b8e 100644 --- a/hw/hpet.c +++ b/hw/hpet.c @@ -164,7 +164,7 @@ static void hpet_pre_save(const void *opaque) s->hpet_counter = hpet_get_ticks(); } -static int hpet_post_load(void *opaque) +static int hpet_post_load(void *opaque, int version_id) { HPETState *s = opaque; diff --git a/hw/hw.h b/hw/hw.h index e407815..6f60493 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -307,7 +307,7 @@ struct VMStateDescription { int minimum_version_id_old; LoadStateHandler *load_state_old; int (*pre_load)(void *opaque); - int (*post_load)(void *opaque); + int (*post_load)(void *opaque, int version_id); void (*pre_save)(const void *opaque); void (*post_save)(const void *opaque); VMStateField *fields; diff --git a/hw/piix_pci.c b/hw/piix_pci.c index edd6df0..5c2bb92 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -172,7 +172,7 @@ static int i440fx_load_old(QEMUFile* f, void *opaque, int version_id) return 0; } -static int i440fx_post_load(void *opaque) +static int i440fx_post_load(void *opaque, int version_id) { PCII440FXState *d = opaque; diff --git a/hw/serial.c b/hw/serial.c index 6f7b30e..ae14021 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -650,7 +650,7 @@ static int serial_pre_load(void *opaque) return 0; } -static int serial_post_load(void *opaque) +static int serial_post_load(void *opaque, int version_id) { SerialState *s = opaque; diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c index 6a95f9e..ab29ee2 100644 --- a/hw/slavio_intctl.c +++ b/hw/slavio_intctl.c @@ -374,7 +374,7 @@ static void slavio_set_irq_all(void *opaque, int irq, int level) } } -static int vmstate_intctl_post_load(void *opaque) +static int vmstate_intctl_post_load(void *opaque, int version_id) { SLAVIO_INTCTLState *s = opaque; diff --git a/hw/tcx.c b/hw/tcx.c index 012d01b..3816c53 100644 --- a/hw/tcx.c +++ b/hw/tcx.c @@ -378,7 +378,7 @@ static void tcx24_invalidate_display(void *opaque) qemu_console_resize(s->ds, s->width, s->height); } -static int vmstate_tcx_post_load(void *opaque) +static int vmstate_tcx_post_load(void *opaque, int version_id) { TCXState *s = opaque; diff --git a/hw/vmmouse.c b/hw/vmmouse.c index c207bb2..bb6e605 100644 --- a/hw/vmmouse.c +++ b/hw/vmmouse.c @@ -235,7 +235,7 @@ static uint32_t vmmouse_ioport_read(void *opaque, uint32_t addr) return data[0]; } -static int vmmouse_post_load(void *opaque) +static int vmmouse_post_load(void *opaque, int version_id) { VMMouseState *s = opaque; diff --git a/savevm.c b/savevm.c index b36c657..fefde7c 100644 --- a/savevm.c +++ b/savevm.c @@ -1084,7 +1084,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, field++; } if (vmsd->post_load) { - return vmsd->post_load(opaque); + return vmsd->post_load(opaque, version_id); } return 0; }