QOM CPUState refactorings

* Clean up AlphaCPU and OpenRISCCPU migration
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQIcBAABAgAGBQJR+YhnAAoJEPou0S0+fgE/xQYP/05Ofg+vn5FkGOsW7D6+O9yZ
 Pkz1WgzeiPUhOKA40M6y32sjNBdbLc3Ixm7124UUg6Ok/mojwux2JPGXqi46ohKV
 mjoEUsxGtA8OESkraYyeDq8YCB/WJDOKQWvXCq6URsY4t7A6FNFEuHFpgGNfh7Q4
 lGy2ZCPC7Vtg/IUGGbZWRHSSMwUwwbB2HaoR0V+rYZziPGBvwTGCcGA4uMMlXA5e
 wBHcyivpcyEN+s4+XdyfRMKhUFqSaN27Ryo57ZQDLK7FltsKKspUEzQoARTnbw6k
 JVyqGgTliOr0Ka3k/V4x7+TO9khCw+/BaZSKmW3sB+fiy4tlVIChvDKtGEWqDhtn
 6HuuFlfMj8CUsuv1Gb9dLcoVy4WaykIJ6r2k5XHhczz+2tosUlIQTXG6sEqv8J2v
 TI++fzJSiq2E3MKDwmg7Q6tUoVqGLkZPWHjURxl4JqmkFEnHRbj1Xg884dDdAyVc
 g/KkcD7WnIdVXYE/wH9JQP8VraewqY8/n/iD+qBYkEhWIUTDwaf6gOqcMAR4hpMj
 ud8uBUdQs8kdBx0nYoM40aVRgPppP960w2s/3qQuF5BmGTDS+SgrpEyU+69skHHw
 hGUX5snBhmyb5/u4nuqi0w//U5+UtEXo1m8eun3oOqVJgP7qsqc3KifujMNsqt8V
 KBVerOaqo4AJqIRFO3KS
 =WmA4
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging

QOM CPUState refactorings

* Clean up AlphaCPU and OpenRISCCPU migration

# gpg: Signature made Wed 31 Jul 2013 04:57:59 PM CDT using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found

# By Andreas Färber
# Via Andreas Färber
* afaerber/tags/qom-cpu-for-anthony:
  cpu: Fix VMSTATE_CPU() semantics

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);