Patchwork [06/25] vmstate: use new style for lm32 cpus

login
register
mail settings
Submitter Juan Quintela
Date Oct. 25, 2011, 2 p.m.
Message ID <d45cc34a567abd6f8c84adf8429f3168bcd84e1e.1319550280.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/121715/
State New
Headers show

Comments

Juan Quintela - Oct. 25, 2011, 2 p.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
CC:  Michael Walle <michael@walle.cc>
---
 target-lm32/cpu.h     |    2 --
 target-lm32/machine.c |   12 +-----------
 2 files changed, 1 insertions(+), 13 deletions(-)
Michael Walle - Oct. 25, 2011, 7:02 p.m.
Am Dienstag 25 Oktober 2011, 16:00:40 schrieb Juan Quintela:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> CC:  Michael Walle <michael@walle.cc>
> ---
>  target-lm32/cpu.h     |    2 --
>  target-lm32/machine.c |   12 +-----------
>  2 files changed, 1 insertions(+), 13 deletions(-)
> 
> diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h
> index 037ef52..bd37af8 100644
> --- a/target-lm32/cpu.h
> +++ b/target-lm32/cpu.h
> @@ -202,8 +202,6 @@ void cpu_lm32_set_phys_msb_ignore(CPUState *env, int
> value); #define cpu_gen_code cpu_lm32_gen_code
>  #define cpu_signal_handler cpu_lm32_signal_handler
> 
> -#define CPU_SAVE_VERSION 1
> -
>  int cpu_lm32_handle_mmu_fault(CPUState *env, target_ulong address, int rw,
>                                int mmu_idx);
>  #define cpu_handle_mmu_fault cpu_lm32_handle_mmu_fault
> diff --git a/target-lm32/machine.c b/target-lm32/machine.c
> index 9014a9f..e9ed250 100644
> --- a/target-lm32/machine.c
> +++ b/target-lm32/machine.c
> @@ -3,7 +3,7 @@
> 
>  const VMStateDescription vmstate_cpu = {
>      .name = "cpu",
> -    .version_id = CPU_SAVE_VERSION,
> +    .version_id = 1,
>      .minimum_version_id = 1,
>      .minimum_version_id_old = 1,
>      .fields      = (VMStateField[]) {
> @@ -21,13 +21,3 @@ const VMStateDescription vmstate_cpu = {
>          VMSTATE_END_OF_LIST()
>      }
>  };
> -
> -void cpu_save(QEMUFile *f, void *opaque)
> -{
> -    vmstate_save_state(f, &vmstate_cpu, opaque);
> -}
> -
> -int cpu_load(QEMUFile *f, void *opaque, int version_id)
> -{
> -    return vmstate_load_state(f, &vmstate_cpu, opaque, version_id);
> -}


Acked-by: Michael Walle <michael@walle.cc>

Patch

diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h
index 037ef52..bd37af8 100644
--- a/target-lm32/cpu.h
+++ b/target-lm32/cpu.h
@@ -202,8 +202,6 @@  void cpu_lm32_set_phys_msb_ignore(CPUState *env, int value);
 #define cpu_gen_code cpu_lm32_gen_code
 #define cpu_signal_handler cpu_lm32_signal_handler

-#define CPU_SAVE_VERSION 1
-
 int cpu_lm32_handle_mmu_fault(CPUState *env, target_ulong address, int rw,
                               int mmu_idx);
 #define cpu_handle_mmu_fault cpu_lm32_handle_mmu_fault
diff --git a/target-lm32/machine.c b/target-lm32/machine.c
index 9014a9f..e9ed250 100644
--- a/target-lm32/machine.c
+++ b/target-lm32/machine.c
@@ -3,7 +3,7 @@ 

 const VMStateDescription vmstate_cpu = {
     .name = "cpu",
-    .version_id = CPU_SAVE_VERSION,
+    .version_id = 1,
     .minimum_version_id = 1,
     .minimum_version_id_old = 1,
     .fields      = (VMStateField[]) {
@@ -21,13 +21,3 @@  const VMStateDescription vmstate_cpu = {
         VMSTATE_END_OF_LIST()
     }
 };
-
-void cpu_save(QEMUFile *f, void *opaque)
-{
-    vmstate_save_state(f, &vmstate_cpu, opaque);
-}
-
-int cpu_load(QEMUFile *f, void *opaque, int version_id)
-{
-    return vmstate_load_state(f, &vmstate_cpu, opaque, version_id);
-}