[Qemu-devel] [PULL for-1.6 0/1] QOM CPUState patch queue 2013-07-31

[Qemu-devel] [PULL for-1.6 0/1] QOM CPUState patch queue 2013-07-31

[Andreas Färber]

Hello Anthony,

This is my current QOM CPU patch queue for 1.6. Please pull.

Thanks,
Andreas

Cc: Anthony Liguori <anthony@codemonkey.ws>

The following changes since commit 1197cbb9eda1dc82e2fa1815ca62bc3de158353e:

  qdev: Use clz in print_size (2013-07-31 07:54:21 -0500)

are available in the git repository at:

  git://github.com/afaerber/qemu-cpu.git tags/qom-cpu-for-anthony

for you to fetch changes up to e0d479445876676f3f92e1bc6d5f92d4bb2500f8:

  cpu: Fix VMSTATE_CPU() semantics (2013-07-31 21:03:59 +0200)

----------------------------------------------------------------
QOM CPUState refactorings

* Clean up AlphaCPU and OpenRISCCPU migration

----------------------------------------------------------------
Andreas Färber (1):
      cpu: Fix VMSTATE_CPU() semantics

 exec.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

[Qemu-devel] [PULL 1/1] cpu: Fix VMSTATE_CPU() semantics

[Andreas Färber]

Commit 1a1562f5ea3da17d45d3829e35b5f49da9ec2db5 prepared a VMSTATE_CPU()
macro for device-style VMStateDescription registration, but missed to
adapt cpu_exec_init(), so that the "cpu_common" VMStateDescription was
still registered for AlphaCPU (fe31e7374299c0c6172ce618b29bf2fecbd881c7)
and OpenRISCCPU (da69721460e652072b6a3dd52b7693da21ffe237). Fix this.

Cc: Richard Henderson <rth@twiddle.net>
Tested-by: Jia Liu <proljc@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 exec.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/exec.c b/exec.c
index c4f2894..3ca9381 100644
--- a/exec.c
+++ b/exec.c
@@ -402,11 +402,14 @@ void cpu_exec_init(CPUArchState *env)
 #if defined(CONFIG_USER_ONLY)
     cpu_list_unlock();
 #endif
-    vmstate_register(NULL, cpu_index, &vmstate_cpu_common, cpu);
+    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, env);
     assert(cc->vmsd == NULL);
+    assert(qdev_get_vmsd(DEVICE(cpu)) == NULL);
 #endif
     if (cc->vmsd != NULL) {
         vmstate_register(NULL, cpu_index, cc->vmsd, cpu);
-- 
1.8.1.4