diff mbox

cpu: cpu_save/cpu_load is no more

Message ID 1453205308-20476-1-git-send-email-pbonzini@redhat.com
State New
Headers show

Commit Message

Paolo Bonzini Jan. 19, 2016, 12:08 p.m. UTC
Everything has been converted to vmstate.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 exec.c                | 6 ------
 include/qemu-common.h | 6 ------
 2 files changed, 12 deletions(-)

Comments

Michael Tokarev Jan. 30, 2016, 9:36 a.m. UTC | #1
19.01.2016 15:08, Paolo Bonzini wrote:
> Everything has been converted to vmstate.

Applied to -trivial, thanks!

/mjt\
Peter Maydell Jan. 30, 2016, 3:16 p.m. UTC | #2
On 30 January 2016 at 09:36, Michael Tokarev <mjt@tls.msk.ru> wrote:
> 19.01.2016 15:08, Paolo Bonzini wrote:
>> Everything has been converted to vmstate.
>
> Applied to -trivial, thanks!

Ah, I missed that Paolo had sent out this patch before me
(my version is http://patchwork.ozlabs.org/patch/572694/ but
a week later...)

thanks
-- PMM
diff mbox

Patch

diff --git a/exec.c b/exec.c
index 0d8ca3f..35705a1 100644
--- a/exec.c
+++ b/exec.c
@@ -628,12 +628,6 @@  void cpu_exec_init(CPUState *cpu, Error **errp)
     if (qdev_get_vmsd(DEVICE(cpu)) == NULL) {
         vmstate_register(NULL, cpu_index, &vmstate_cpu_common, cpu);
     }
-#if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY)
-    register_savevm(NULL, "cpu", cpu_index, CPU_SAVE_VERSION,
-                    cpu_save, cpu_load, cpu->env_ptr);
-    assert(cc->vmsd == NULL);
-    assert(qdev_get_vmsd(DEVICE(cpu)) == NULL);
-#endif
     if (cc->vmsd != NULL) {
         vmstate_register(NULL, cpu_index, cc->vmsd, cpu);
     }
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 22b010c..f557be7 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -330,12 +330,6 @@  bool tcg_enabled(void);
 
 void cpu_exec_init_all(void);
 
-/* CPU save/load.  */
-#ifdef CPU_SAVE_VERSION
-void cpu_save(QEMUFile *f, void *opaque);
-int cpu_load(QEMUFile *f, void *opaque, int version_id);
-#endif
-
 /* Unblock cpu */
 void qemu_cpu_kick_self(void);