mbox

[PULL,00/21] ppc patch queue 2013-01-25

Message ID 1359118384-9555-1-git-send-email-agraf@suse.de
State New
Headers show

Pull-request

git://repo.or.cz/qemu/agraf.git ppc-for-upstream

Message

Alexander Graf Jan. 25, 2013, 12:52 p.m. UTC 
Hi Blue / Aurelien,

This is my current patch queue for ppc.  Please pull.

Alex


The following changes since commit 11c29918be32be5b00f367c7da9724a5cddbbb0f:
  Anthony Liguori (1):
        Merge remote-tracking branch 'bonzini/scsi-next' into staging

are available in the git repository at:

  git://repo.or.cz/qemu/agraf.git ppc-for-upstream

Alexander Graf (1):
      PPC: Move ppc specific hw emulation to hw/ppc

Andreas Färber (12):
      ppc: Move Mac machines to hw/ppc/
      macio: QOM'ify some more
      macio: Delay qdev init until all fields are initialized
      macio: Split MacIO in two
      mac_nvram: Clean up public API
      mac_nvram: Mark as Big Endian
      mac_nvram: QOM'ify MacIO NVRAM
      ide/macio: QOM'ify MacIO IDE
      cuda: QOM'ify CUDA
      adb: QOM'ify Apple Desktop Bus
      adb: QOM'ify ADB devices
      cuda: Move ADB bus into CUDA state

David Gibson (2):
      pseries: Improve handling of multiple PCI host bridges
      pseries: Adjust default VIO address allocations to play better with libvirt

Mike Qiu (1):
      target-ppc: Give a meaningful error if too many threads are specified

Scott Wood (5):
      openpic: fix remaining issues from idr-to-destmask conversion
      openpic: fix timer address decoding
      openpic: add basic support for MPIC v4.2
      PPC: e500: fix mpic_iack address
      PPC: e500: Select MPIC v4.2 on ppce500 platform

 MAINTAINERS                               |   20 +-
 hw/Makefile.objs                          |   16 +--
 hw/ide.h                                  |    4 -
 hw/ide/macio.c                            |   84 +++++--
 hw/macio.c                                |  140 -----------
 hw/ppc/Makefile.objs                      |   45 +++-
 hw/{ => ppc}/adb.c                        |  254 +++++++++++++++-----
 hw/{ => ppc}/adb.h                        |   46 +++-
 hw/{ => ppc}/cuda.c                       |  108 ++++-----
 hw/{ => ppc}/dec_pci.c                    |   10 +-
 hw/{ => ppc}/dec_pci.h                    |    0
 hw/ppc/e500.c                             |   12 +-
 hw/ppc/e500.h                             |    2 +
 hw/ppc/e500plat.c                         |    6 +-
 hw/{ => ppc}/grackle_pci.c                |    6 +-
 hw/{ => ppc}/heathrow_pic.c               |    4 +-
 hw/ppc/mac.h                              |  181 ++++++++++++++
 hw/{ => ppc}/mac_dbdma.c                  |    4 +-
 hw/{ => ppc}/mac_dbdma.h                  |    0
 hw/{ppc_newworld.c => ppc/mac_newworld.c} |   66 ++++--
 hw/{ => ppc}/mac_nvram.c                  |   92 +++++---
 hw/{ppc_oldworld.c => ppc/mac_oldworld.c} |   61 +++---
 hw/ppc/macio.c                            |  305 ++++++++++++++++++++++++
 hw/{ => ppc}/mpc8544_guts.c               |    4 +-
 hw/ppc/mpc8544ds.c                        |    4 +-
 hw/{ => ppc}/openpic.c                    |  371 +++++++++++++++++++----------
 hw/{ => ppc}/openpic.h                    |    1 +
 hw/{ => ppc}/ppc-viosrp.h                 |    0
 hw/{ => ppc}/ppc.c                        |    8 +-
 hw/{ => ppc}/ppc.h                        |    0
 hw/{ => ppc}/ppc405.h                     |    0
 hw/{ => ppc}/ppc405_boards.c              |   10 +-
 hw/{ => ppc}/ppc405_uc.c                  |    4 +-
 hw/{ => ppc}/ppc440_bamboo.c              |   12 +-
 hw/{ => ppc}/ppc4xx.h                     |    2 +-
 hw/{ => ppc}/ppc4xx_devs.c                |    2 +-
 hw/{ => ppc}/ppc4xx_pci.c                 |    6 +-
 hw/{ => ppc}/ppc_booke.c                  |    6 +-
 hw/{ => ppc}/ppc_prep.c                   |    0
 hw/{ => ppc}/ppce500_pci.c                |    8 +-
 hw/{ => ppc}/ppce500_pci.h                |    0
 hw/{ => ppc}/ppce500_spin.c               |    4 +-
 hw/{ => ppc}/spapr.c                      |   27 +--
 hw/{ => ppc}/spapr.h                      |    2 +-
 hw/{ => ppc}/spapr_events.c               |    4 +-
 hw/{ => ppc}/spapr_hcall.c                |    2 +-
 hw/{ => ppc}/spapr_iommu.c                |    6 +-
 hw/{ => ppc}/spapr_llan.c                 |    6 +-
 hw/{ => ppc}/spapr_nvram.c                |    4 +-
 hw/{ => ppc}/spapr_pci.c                  |  116 +++++++---
 hw/{ => ppc}/spapr_pci.h                  |   24 ++-
 hw/{ => ppc}/spapr_rtas.c                 |    4 +-
 hw/{ => ppc}/spapr_vio.c                  |   14 +-
 hw/{ => ppc}/spapr_vio.h                  |    0
 hw/{ => ppc}/spapr_vscsi.c                |   12 +-
 hw/{ => ppc}/spapr_vty.c                  |    6 +-
 hw/{ => ppc}/srp.h                        |    0
 hw/{ => ppc}/unin_pci.c                   |    8 +-
 hw/{ => ppc}/virtex_ml507.c               |   16 +-
 hw/{ => ppc}/xics.c                       |    6 +-
 hw/{ => ppc}/xics.h                       |    0
 hw/ppc_mac.h                              |   81 -------
 target-ppc/kvm.c                          |    6 +-
 target-ppc/translate_init.c               |   12 +
 64 files changed, 1466 insertions(+), 798 deletions(-)
 delete mode 100644 hw/macio.c
 rename hw/{ => ppc}/adb.c (65%)
 rename hw/{ => ppc}/adb.h (67%)
 rename hw/{ => ppc}/cuda.c (92%)
 rename hw/{ => ppc}/dec_pci.c (97%)
 rename hw/{ => ppc}/dec_pci.h (100%)
 rename hw/{ => ppc}/grackle_pci.c (98%)
 rename hw/{ => ppc}/heathrow_pic.c (99%)
 create mode 100644 hw/ppc/mac.h
 rename hw/{ => ppc}/mac_dbdma.c (99%)
 rename hw/{ => ppc}/mac_dbdma.h (100%)
 rename hw/{ppc_newworld.c => ppc/mac_newworld.c} (90%)
 rename hw/{ => ppc}/mac_nvram.c (68%)
 rename hw/{ppc_oldworld.c => ppc/mac_oldworld.c} (90%)
 create mode 100644 hw/ppc/macio.c
 rename hw/{ => ppc}/mpc8544_guts.c (98%)
 rename hw/{ => ppc}/openpic.c (86%)
 rename hw/{ => ppc}/openpic.h (93%)
 rename hw/{ => ppc}/ppc-viosrp.h (100%)
 rename hw/{ => ppc}/ppc.c (99%)
 rename hw/{ => ppc}/ppc.h (100%)
 rename hw/{ => ppc}/ppc405.h (100%)
 rename hw/{ => ppc}/ppc405_boards.c (99%)
 rename hw/{ => ppc}/ppc405_uc.c (99%)
 rename hw/{ => ppc}/ppc440_bamboo.c (98%)
 rename hw/{ => ppc}/ppc4xx.h (99%)
 rename hw/{ => ppc}/ppc4xx_devs.c (99%)
 rename hw/{ => ppc}/ppc4xx_pci.c (99%)
 rename hw/{ => ppc}/ppc_booke.c (99%)
 rename hw/{ => ppc}/ppc_prep.c (100%)
 rename hw/{ => ppc}/ppce500_pci.c (99%)
 rename hw/{ => ppc}/ppce500_pci.h (100%)
 rename hw/{ => ppc}/ppce500_spin.c (99%)
 rename hw/{ => ppc}/spapr.c (97%)
 rename hw/{ => ppc}/spapr.h (99%)
 rename hw/{ => ppc}/spapr_events.c (99%)
 rename hw/{ => ppc}/spapr_hcall.c (99%)
 rename hw/{ => ppc}/spapr_iommu.c (99%)
 rename hw/{ => ppc}/spapr_llan.c (99%)
 rename hw/{ => ppc}/spapr_nvram.c (99%)
 rename hw/{ => ppc}/spapr_pci.c (90%)
 rename hw/{ => ppc}/spapr_pci.h (81%)
 rename hw/{ => ppc}/spapr_rtas.c (99%)
 rename hw/{ => ppc}/spapr_vio.c (99%)
 rename hw/{ => ppc}/spapr_vio.h (100%)
 rename hw/{ => ppc}/spapr_vscsi.c (99%)
 rename hw/{ => ppc}/spapr_vty.c (98%)
 rename hw/{ => ppc}/srp.h (100%)
 rename hw/{ => ppc}/unin_pci.c (99%)
 rename hw/{ => ppc}/virtex_ml507.c (97%)
 rename hw/{ => ppc}/xics.c (99%)
 rename hw/{ => ppc}/xics.h (100%)
 delete mode 100644 hw/ppc_mac.h

Comments

Andreas Färber Jan. 25, 2013, 1:40 p.m. UTC | #1 
Am 25.01.2013 13:52, schrieb Alexander Graf:
> Hi Blue / Aurelien,
> 
> This is my current patch queue for ppc.  Please pull.
> 
> Alex
> 
> 
> The following changes since commit 11c29918be32be5b00f367c7da9724a5cddbbb0f:
>   Anthony Liguori (1):
>         Merge remote-tracking branch 'bonzini/scsi-next' into staging
> 
> are available in the git repository at:
> 
>   git://repo.or.cz/qemu/agraf.git ppc-for-upstream

  CC    hw/ide/macio.o
/home/andreas/QEMU/qemu-ppc/hw/ide/macio.c:27:26: fatal error:
hw/mac_dbdma.h: Datei oder Verzeichnis nicht gefunden
compilation terminated.
make: *** [hw/ide/macio.o] Fehler 1

s390-for-upstream compiles okay.

Andreas
Alexander Graf Jan. 25, 2013, 1:47 p.m. UTC | #2 
On 25.01.2013, at 14:40, Andreas Färber wrote:

> Am 25.01.2013 13:52, schrieb Alexander Graf:
>> Hi Blue / Aurelien,
>> 
>> This is my current patch queue for ppc.  Please pull.
>> 
>> Alex
>> 
>> 
>> The following changes since commit 11c29918be32be5b00f367c7da9724a5cddbbb0f:
>>  Anthony Liguori (1):
>>        Merge remote-tracking branch 'bonzini/scsi-next' into staging
>> 
>> are available in the git repository at:
>> 
>>  git://repo.or.cz/qemu/agraf.git ppc-for-upstream
> 
>  CC    hw/ide/macio.o
> /home/andreas/QEMU/qemu-ppc/hw/ide/macio.c:27:26: fatal error:
> hw/mac_dbdma.h: Datei oder Verzeichnis nicht gefunden
> compilation terminated.
> make: *** [hw/ide/macio.o] Fehler 1

Oops :). Fixed up the offending patch and queues.


Alex
Blue Swirl Jan. 26, 2013, 3:12 p.m. UTC | #3 
On Fri, Jan 25, 2013 at 1:47 PM, Alexander Graf <agraf@suse.de> wrote:
>
> On 25.01.2013, at 14:40, Andreas Färber wrote:
>
>> Am 25.01.2013 13:52, schrieb Alexander Graf:
>>> Hi Blue / Aurelien,
>>>
>>> This is my current patch queue for ppc.  Please pull.
>>>
>>> Alex
>>>
>>>
>>> The following changes since commit 11c29918be32be5b00f367c7da9724a5cddbbb0f:
>>>  Anthony Liguori (1):
>>>        Merge remote-tracking branch 'bonzini/scsi-next' into staging
>>>
>>> are available in the git repository at:
>>>
>>>  git://repo.or.cz/qemu/agraf.git ppc-for-upstream
>>
>>  CC    hw/ide/macio.o
>> /home/andreas/QEMU/qemu-ppc/hw/ide/macio.c:27:26: fatal error:
>> hw/mac_dbdma.h: Datei oder Verzeichnis nicht gefunden
>> compilation terminated.
>> make: *** [hw/ide/macio.o] Fehler 1
>
> Oops :). Fixed up the offending patch and queues.

Thanks, pulled.

>
>
> Alex
>