From patchwork Thu Sep 10 01:04:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 33245 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 BAA6EB7088 for ; Thu, 10 Sep 2009 11:20:28 +1000 (EST) Received: from localhost ([127.0.0.1]:51331 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlYKn-0000wf-Ic for incoming@patchwork.ozlabs.org; Wed, 09 Sep 2009 21:20:25 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlY62-0004TA-OZ for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlY5w-0004O4-62 for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:08 -0400 Received: from [199.232.76.173] (port=48256 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlY5w-0004Nx-2z for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8669) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlY5v-0002lt-G7 for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:03 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8A152Vl019499 for ; Wed, 9 Sep 2009 21:05:02 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8A14ooc020882; Wed, 9 Sep 2009 21:05:01 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 03:04:30 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 09/26] vmstate: rename run_after_load() -> 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 This naming was used in kvm tree, and is easier to remember Signed-off-by: Juan Quintela --- hw/acpi.c | 4 ++-- hw/hw.h | 2 +- hw/piix_pci.c | 4 ++-- hw/slavio_intctl.c | 4 ++-- hw/tcx.c | 4 ++-- savevm.c | 5 +++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/hw/acpi.c b/hw/acpi.c index ef4f782..b14b9f4 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_after_load(void *opaque) +static int vmstate_acpi_post_load(void *opaque) { PIIX4PMState *s = opaque; @@ -454,7 +454,7 @@ static const VMStateDescription vmstate_acpi = { .version_id = 1, .minimum_version_id = 1, .minimum_version_id_old = 1, - .run_after_load = vmstate_acpi_after_load, + .post_load = vmstate_acpi_post_load, .fields = (VMStateField []) { VMSTATE_PCI_DEVICE(dev, PIIX4PMState), VMSTATE_UINT16(pmsts, PIIX4PMState), diff --git a/hw/hw.h b/hw/hw.h index c703975..c85ce50 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -306,7 +306,7 @@ struct VMStateDescription { int minimum_version_id; int minimum_version_id_old; LoadStateHandler *load_state_old; - int (*run_after_load)(void *opaque); + int (*post_load)(void *opaque); VMStateField *fields; }; diff --git a/hw/piix_pci.c b/hw/piix_pci.c index ef3463b..edd6df0 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_after_load(void *opaque) +static int i440fx_post_load(void *opaque) { PCII440FXState *d = opaque; @@ -186,7 +186,7 @@ static const VMStateDescription vmstate_i440fx = { .minimum_version_id = 3, .minimum_version_id_old = 1, .load_state_old = i440fx_load_old, - .run_after_load = i440fx_after_load, + .post_load = i440fx_post_load, .fields = (VMStateField []) { VMSTATE_PCI_DEVICE(dev, PCII440FXState), VMSTATE_UINT8(smm_enabled, PCII440FXState), diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c index 259e45e..6a95f9e 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_after_load(void *opaque) +static int vmstate_intctl_post_load(void *opaque) { SLAVIO_INTCTLState *s = opaque; @@ -398,7 +398,7 @@ static const VMStateDescription vmstate_intctl = { .version_id = 1, .minimum_version_id = 1, .minimum_version_id_old = 1, - .run_after_load = vmstate_intctl_after_load, + .post_load = vmstate_intctl_post_load, .fields = (VMStateField []) { VMSTATE_STRUCT_ARRAY(slaves, SLAVIO_INTCTLState, MAX_CPUS, 1, vmstate_intctl_cpu, SLAVIO_CPUINTCTLState), diff --git a/hw/tcx.c b/hw/tcx.c index 9996219..012d01b 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_after_load(void *opaque) +static int vmstate_tcx_post_load(void *opaque) { TCXState *s = opaque; @@ -397,7 +397,7 @@ static const VMStateDescription vmstate_tcx = { .version_id = 4, .minimum_version_id = 4, .minimum_version_id_old = 4, - .run_after_load = vmstate_tcx_after_load, + .post_load = vmstate_tcx_post_load, .fields = (VMStateField []) { VMSTATE_UINT16(height, TCXState), VMSTATE_UINT16(width, TCXState), diff --git a/savevm.c b/savevm.c index 7b0989f..38f9946 100644 --- a/savevm.c +++ b/savevm.c @@ -1057,8 +1057,9 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, } field++; } - if (vmsd->run_after_load) - return vmsd->run_after_load(opaque); + if (vmsd->post_load) { + return vmsd->post_load(opaque); + } return 0; }