[Qemu-devel,qom-cpu,v3,05/14] cpu: Make first_cpu and next_cpu CPUState

Commit Message

Andreas Färber July 1, 2013, 5:37 p.m. UTC

Am 26.06.2013 19:35, schrieb Andreas Färber:
> Move next_cpu from CPU_COMMON to CPUState.
> Move first_cpu variable to qom/cpu.h.
> 
> gdbstub needs to use CPUState::env_ptr for now.
> cpu_copy() no longer needs to save and restore cpu_next.
> 
> Acked-by: Paolo Bonzini <[e-mail]>
> [AF: Rebased, simplified cpu_copy()]
> Signed-off-by: Andreas Färber <[e-mail]>

Squashing the following additional conversion after rebase.

Andreas


@@ -512,9 +511,7 @@ static DeviceState
*ppce500_init_mpic_kvm(PPCE500Params *params,
         return NULL;
     }

-    for (env = first_cpu; env != NULL; env = env->next_cpu) {
-        cs = ENV_GET_CPU(env);
-
+    for (cs = first_cpu; cs != NULL; cs = cs->next_cpu) {
         if (kvm_openpic_connect_vcpu(dev, cs)) {

Patch

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 38f7990..ff86154 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -500,7 +500,6 @@  static DeviceState
*ppce500_init_mpic_kvm(PPCE500Params *params,
                                           qemu_irq **irqs)
 {
     DeviceState *dev;
-    CPUPPCState *env;
     CPUState *cs;
     int r;