Patchwork [PULL] QOM CPUState, part 3a: cleanups & preparations

login
register
mail settings
Submitter Andreas Färber
Date June 11, 2012, midnight
Message ID <1339372859-30148-1-git-send-email-afaerber@suse.de>
Download mbox
Permalink /patch/164017/
State New
Headers show

Pull-request

git://repo.or.cz/qemu/afaerber.git qom-cpu-3a

Comments

Andreas Färber - June 11, 2012, midnight
Hello Anthony/Blue,

Please pull the next batch of QOM CPUState refactorings, largely cherry-picked
from qom-next queue.

The first seven patches clean up some ARM naming issues introduced by part 3.

The rest prepare ARM, Xen and target-s390 for moving fields into CPUState.
Alex has kindly agreed to include the s390x patches from part 4 here, they
were briefly re-tested on s390 SLES (final patch only affects s390 KVM).

Known conflicts:
* i.MX31 series: arm_pic_init_cpu() and arm_load_kernel()

Outlook:
* QOM CPUState part 4 is on the list, still applies and 95% in need of review.
* QOM CPUState part 5 (CPU as device) depends on qom-next (QBus) merge.

Regards,
Andreas

Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Blue Swirl <blauwirbel@gmail.com>

Cc: Alexander Graf <agraf@suse.de>

Cc: Peter Chubb <peter.chubb@nicta.com.au> (FYI)

The following changes since commit dbaf26b3b22daae3be6a89b965e43503e7c3b912:

  Revert "build: compile oslib-obj-y once" (2012-06-10 20:29:19 +0000)

are available in the git repository at:
  git://repo.or.cz/qemu/afaerber.git qom-cpu-3a

Andreas Färber (27):
      nseries: Rename n800_s::cpu to mpu
      omap_sx1: Rename omap_mpu_state_s variable
      palm: Rename omap_mpu_state_s variable
      mainstone: Rename PXA2xxState variable
      spitz: Rename PXA2xxState variable
      tosa: Rename PXA2xxState variable
      z2: Rename PXA2xxState variable
      strongarm: Use cpu_arm_init() to store ARMCPU in StrongARMState
      integratorcp: Use cpu_arm_init() to obtain ARMCPU
      musicpal: Use cpu_arm_init() to obtain ARMCPU
      versatilepb: Use cpu_arm_init() to obtain ARMCPU
      arm_boot: Pass ARMCPU to arm_boot_info::write_secondary_boot()
      arm_boot: Pass ARMCPU to arm_boot_info::secondary_cpu_reset_hook()
      realview: Use cpu_arm_init() to obtain ARMCPU
      vexpress: Use cpu_arm_init() to obtain ARMCPU
      exynos4210: Use cpu_arm_init() to store ARMCPU
      pxa2xx: Pass ARMCPU to pxa2xx_pic_init()
      pxa2xx_pic: Store ARMCPU in PXA2xxPICState
      pxa2xx_gpio: Store ARMCPU in PXA2xxGPIOInfo
      xilinx_zynq: Use cpu_arm_init() to obtain ARMCPU
      arm_boot: Pass ARMCPU to arm_load_kernel()
      arm_pic: Pass ARMCPU to arm_pic_init_cpu()
      xen_machine_pv: Use cpu_x86_init() to obtain X86CPU
      target-s390x: Let cpu_s390x_init() return S390CPU
      s390-virtio: Use cpu_s390x_init() to obtain S390CPU
      s390-virtio: Let s390_cpu_addr2state() return S390CPU
      target-s390x: Pass S390CPU to s390_cpu_restart()

 hw/arm-misc.h         |    8 +++---
 hw/arm_boot.c         |   14 +++++----
 hw/arm_pic.c          |    8 +++--
 hw/armv7m.c           |    2 +-
 hw/collie.c           |    2 +-
 hw/exynos4210.c       |    9 +++---
 hw/exynos4210.h       |    4 +-
 hw/exynos4_boards.c   |    4 +-
 hw/highbank.c         |   13 +++++----
 hw/integratorcp.c     |   14 +++++----
 hw/mainstone.c        |   16 +++++-----
 hw/musicpal.c         |   10 +++---
 hw/nseries.c          |   72 ++++++++++++++++++++++++------------------------
 hw/omap1.c            |    2 +-
 hw/omap2.c            |    2 +-
 hw/omap_sx1.c         |    6 ++--
 hw/palm.c             |   12 ++++----
 hw/pxa.h              |    2 +-
 hw/pxa2xx.c           |    4 +-
 hw/pxa2xx_gpio.c      |    9 +++---
 hw/pxa2xx_pic.c       |   32 ++++++++++++---------
 hw/realview.c         |   12 +++++---
 hw/s390-virtio-bus.c  |    6 +++-
 hw/s390-virtio.c      |   12 +++++---
 hw/spitz.c            |   24 ++++++++--------
 hw/strongarm.c        |    6 ++--
 hw/strongarm.h        |    2 +-
 hw/tosa.c             |   14 +++++-----
 hw/versatilepb.c      |   13 +++++----
 hw/vexpress.c         |   18 ++++++------
 hw/xen_machine_pv.c   |    4 ++-
 hw/xilinx_zynq.c      |   10 +++---
 hw/z2.c               |   26 +++++++++---------
 target-s390x/cpu.c    |    2 +-
 target-s390x/cpu.h    |   10 +++---
 target-s390x/helper.c |    4 +-
 target-s390x/kvm.c    |   12 +++++---
 37 files changed, 223 insertions(+), 197 deletions(-)
Anthony Liguori - June 11, 2012, 6:27 p.m.
On 06/10/2012 07:00 PM, Andreas Färber wrote:
> Hello Anthony/Blue,
>
> Please pull the next batch of QOM CPUState refactorings, largely cherry-picked
> from qom-next queue.
>
> The first seven patches clean up some ARM naming issues introduced by part 3.
>
> The rest prepare ARM, Xen and target-s390 for moving fields into CPUState.
> Alex has kindly agreed to include the s390x patches from part 4 here, they
> were briefly re-tested on s390 SLES (final patch only affects s390 KVM).
>
> Known conflicts:
> * i.MX31 series: arm_pic_init_cpu() and arm_load_kernel()
>
> Outlook:
> * QOM CPUState part 4 is on the list, still applies and 95% in need of review.
> * QOM CPUState part 5 (CPU as device) depends on qom-next (QBus) merge.
>
> Regards,
> Andreas

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Cc: Anthony Liguori<anthony@codemonkey.ws>
> Cc: Blue Swirl<blauwirbel@gmail.com>
>
> Cc: Alexander Graf<agraf@suse.de>
>
> Cc: Peter Chubb<peter.chubb@nicta.com.au>  (FYI)
>
> The following changes since commit dbaf26b3b22daae3be6a89b965e43503e7c3b912:
>
>    Revert "build: compile oslib-obj-y once" (2012-06-10 20:29:19 +0000)
>
> are available in the git repository at:
>    git://repo.or.cz/qemu/afaerber.git qom-cpu-3a
>
> Andreas Färber (27):
>        nseries: Rename n800_s::cpu to mpu
>        omap_sx1: Rename omap_mpu_state_s variable
>        palm: Rename omap_mpu_state_s variable
>        mainstone: Rename PXA2xxState variable
>        spitz: Rename PXA2xxState variable
>        tosa: Rename PXA2xxState variable
>        z2: Rename PXA2xxState variable
>        strongarm: Use cpu_arm_init() to store ARMCPU in StrongARMState
>        integratorcp: Use cpu_arm_init() to obtain ARMCPU
>        musicpal: Use cpu_arm_init() to obtain ARMCPU
>        versatilepb: Use cpu_arm_init() to obtain ARMCPU
>        arm_boot: Pass ARMCPU to arm_boot_info::write_secondary_boot()
>        arm_boot: Pass ARMCPU to arm_boot_info::secondary_cpu_reset_hook()
>        realview: Use cpu_arm_init() to obtain ARMCPU
>        vexpress: Use cpu_arm_init() to obtain ARMCPU
>        exynos4210: Use cpu_arm_init() to store ARMCPU
>        pxa2xx: Pass ARMCPU to pxa2xx_pic_init()
>        pxa2xx_pic: Store ARMCPU in PXA2xxPICState
>        pxa2xx_gpio: Store ARMCPU in PXA2xxGPIOInfo
>        xilinx_zynq: Use cpu_arm_init() to obtain ARMCPU
>        arm_boot: Pass ARMCPU to arm_load_kernel()
>        arm_pic: Pass ARMCPU to arm_pic_init_cpu()
>        xen_machine_pv: Use cpu_x86_init() to obtain X86CPU
>        target-s390x: Let cpu_s390x_init() return S390CPU
>        s390-virtio: Use cpu_s390x_init() to obtain S390CPU
>        s390-virtio: Let s390_cpu_addr2state() return S390CPU
>        target-s390x: Pass S390CPU to s390_cpu_restart()
>
>   hw/arm-misc.h         |    8 +++---
>   hw/arm_boot.c         |   14 +++++----
>   hw/arm_pic.c          |    8 +++--
>   hw/armv7m.c           |    2 +-
>   hw/collie.c           |    2 +-
>   hw/exynos4210.c       |    9 +++---
>   hw/exynos4210.h       |    4 +-
>   hw/exynos4_boards.c   |    4 +-
>   hw/highbank.c         |   13 +++++----
>   hw/integratorcp.c     |   14 +++++----
>   hw/mainstone.c        |   16 +++++-----
>   hw/musicpal.c         |   10 +++---
>   hw/nseries.c          |   72 ++++++++++++++++++++++++------------------------
>   hw/omap1.c            |    2 +-
>   hw/omap2.c            |    2 +-
>   hw/omap_sx1.c         |    6 ++--
>   hw/palm.c             |   12 ++++----
>   hw/pxa.h              |    2 +-
>   hw/pxa2xx.c           |    4 +-
>   hw/pxa2xx_gpio.c      |    9 +++---
>   hw/pxa2xx_pic.c       |   32 ++++++++++++---------
>   hw/realview.c         |   12 +++++---
>   hw/s390-virtio-bus.c  |    6 +++-
>   hw/s390-virtio.c      |   12 +++++---
>   hw/spitz.c            |   24 ++++++++--------
>   hw/strongarm.c        |    6 ++--
>   hw/strongarm.h        |    2 +-
>   hw/tosa.c             |   14 +++++-----
>   hw/versatilepb.c      |   13 +++++----
>   hw/vexpress.c         |   18 ++++++------
>   hw/xen_machine_pv.c   |    4 ++-
>   hw/xilinx_zynq.c      |   10 +++---
>   hw/z2.c               |   26 +++++++++---------
>   target-s390x/cpu.c    |    2 +-
>   target-s390x/cpu.h    |   10 +++---
>   target-s390x/helper.c |    4 +-
>   target-s390x/kvm.c    |   12 +++++---
>   37 files changed, 223 insertions(+), 197 deletions(-)
>
>