Re: [Qemu-ppc] [Qemu-devel] [PATCH qom-cpu 57/59] cpu: Make first_cpu and next_cpu CPUState (WIP)

[Andreas Färber]

Am 09.06.2013 21:13, schrieb Andreas Färber:
>  cpus.c                    | 15 +++++++++------
>  exec.c                    | 27 ++++++++++++++-------------
>  gdbstub.c                 | 15 ++++++++-------
>  hw/arm/boot.c             | 10 +++++-----
>  hw/arm/exynos4_boards.c   |  4 ++--
>  hw/arm/highbank.c         |  2 +-
>  hw/arm/realview.c         |  2 +-
>  hw/arm/vexpress.c         |  2 +-
>  hw/arm/xilinx_zynq.c      |  2 +-
>  hw/i386/kvm/clock.c       |  6 ++++--
>  hw/i386/kvmvapic.c        |  5 +++--
>  hw/i386/pc.c              | 11 ++++++-----
>  hw/i386/pc_piix.c         |  3 +--
>  hw/intc/sh_intc.c         |  5 ++---
>  hw/isa/lpc_ich9.c         |  2 +-
>  hw/mips/mips_malta.c      |  3 ++-
>  hw/ppc/prep.c             |  6 ++++--
>  hw/ppc/spapr.c            | 12 ++++++------
>  include/exec/cpu-all.h    |  2 +-
>  include/exec/cpu-defs.h   |  1 -
>  include/qom/cpu.h         |  2 ++
>  linux-user/main.c         |  4 ++--
>  linux-user/syscall.c      |  9 ++++++---
>  target-i386/arch_dump.c   |  7 +++++--
>  target-i386/kvm.c         |  8 +++++---
>  target-i386/misc_helper.c |  2 +-
>  26 files changed, 93 insertions(+), 74 deletions(-)

Found one unconverted first_cpu occurrence, breaking the ppc build:

diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 3ab2946..87f25ea 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -1574,7 +1574,7 @@ uint64_t kvmppc_rma_size(uint64_t current_size,
unsigned int hash_shift)

     /* Find the largest hardware supported page size that's less than
      * or equal to the (logical) backing page size of guest RAM */
-    kvm_get_smmu_info(ppc_env_get_cpu(first_cpu), &info);
+    kvm_get_smmu_info(POWERPC_CPU(first_cpu), &info);
     rampagesize = getrampagesize();
     best_page_shift = 0;


Fixed on qom-cpu-10 branch.

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg