mbox

[PULL,2.3,00/38] ppc patch queue 2015-03-08

Message ID 54FD927A.1030606@suse.de
State New
Headers show

Pull-request

git://github.com/agraf/qemu.git tags/signed-ppc-for-upstream

Message

Alexander Graf March 9, 2015, 12:30 p.m. UTC 
On 09.03.15 04:13, Peter Maydell wrote:
> On 8 March 2015 at 17:44, Alexander Graf <agraf@suse.de> wrote:
>> Hi Peter,
>>
>> This is my current patch queue for ppc.  Please pull.
>>
>> Alex
>>
>>
>> The following changes since commit 3539bbb93e944ffde31c61c369ea9eedcc5697a6:
>>
>>   Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150302.0' into staging (2015-03-04 14:37:31 +0000)
>>
>> are available in the git repository at:
>>
>>
>>   git://github.com/agraf/qemu.git tags/signed-ppc-for-upstream
>>
>> for you to fetch changes up to fa11371474207feeda6ca316e03a9bffd1710276:
>>
>>   sPAPR: Implement sPAPRPHBClass EEH callbacks (2015-03-08 09:40:20 +0100)
>>
>> ----------------------------------------------------------------
>> Patch queue for ppc - 2015-03-08
>>
>> This is my current patch queue for 2.3. Highlights include:
>>
>>   * pseries: 2.3 machine
>>   * pseries: Export RTC via QOM
>>   * pseries: EEH support
>>   * mac: save/restore support
>>   * fix POWER5 hosts
>>   * random bug fixes
>>
>> ----------------------------------------------------------------
> 
> This fails make check for me, even after doing a make clean:
> 
> GTESTER check-qtest-ppc64
> qemu-system-ppc64: Unknown device 'isa-fdc' for bus 'ISA'
> Broken pipe
> GTester: last random seed: R02S385093da29c53d07cc12b8b8ef0856f4
> qemu-system-ppc64: Unknown device 'isa-fdc' for bus 'ISA'
> Broken pipe
> GTester: last random seed: R02S689b9882bf19eea3f6e722733d8dcdb7
> make: *** [check-qtest-ppc64] Error 1

Sorry for the hickups again :). I've updated the branch.

I removed the offending patch and added a sparse warning fix patch on
top. Find the new cover letter below - or would you prefer me to resend
the whole thing?


Alex


From: Alexander Graf <agraf@suse.de>
Subject: [PULL 2.3 00/38] ppc patch queue 2015-03-09

Hi Peter,

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

Alex


The following changes since commit 3539bbb93e944ffde31c61c369ea9eedcc5697a6:

  Merge remote-tracking branch
'remotes/awilliam/tags/vfio-update-20150302.0' into staging (2015-03-04
14:37:31 +0000)

are available in the git repository at:


  git://github.com/agraf/qemu.git tags/signed-ppc-for-upstream

for you to fetch changes up to 67678f0439267a12674c9c30b3319a402f33dc64:

  target-ppc: Fix warnings from Sparse (2015-03-09 13:28:03 +0100)

----------------------------------------------------------------
Patch queue for ppc - 2015-03-09

This is my current patch queue for 2.3. Highlights include:

  * pseries: 2.3 machine
  * pseries: Export RTC via QOM
  * pseries: EEH support
  * mac: save/restore support
  * fix POWER5 hosts
  * random bug fixes

----------------------------------------------------------------
Alexander Graf (1):
      PPC: Remove duplicate OPENPIC defines in default-configs

Alexey Kardashevskiy (6):
      spapr_vio/spapr_iommu: Move VIO bypass where it belongs
      spapr: Add pseries-2.3 machine
      spapr-pci: Enable huge BARs
      Revert "default-configs/ppc64: add all components of i82378
SuperIO chip used by prep"
      ppc64-softmmu: Remove duplicated OPENPIC from config
      target-ppc: Add versions to server CPU descriptions

Aneesh Kumar K.V (1):
      target-ppc: Use right page size with hash table lookup

Cyril Bur (1):
      PPC: Introduce the Virtual Time Base (VTB) SPR register

David Gibson (12):
      pseries: Limit PCI host bridge "index" value
      Generalize QOM publishing of date and time from mc146818rtc.c
      Add more VMSTATE_*_TEST variants for integers
      pseries: Move sPAPR RTC code into its own file
      pseries: Add more parameter validation in RTAS time of day functions
      pseries: Add spapr_rtc_read() helper function
      pseries: Make RTAS time of day functions respect -rtc options
      pseries: Make the PAPR RTC a qdev device
      pseries: Move rtc_offset into RTC device's state structure
      pseries: Export RTC time via QOM
      vga: Expose framebuffer byteorder as a QOM property
      pseries: Switch VGA endian on H_SET_MODE

Fabien Chouteau (1):
      Openpic: check that cpu id is within the number of cpus

Gavin Shan (2):
      sPAPR: Implement EEH RTAS calls
      sPAPR: Implement sPAPRPHBClass EEH callbacks

Mark Cave-Ayland (9):
      macio.c: include parent PCIDevice state in VMStateDescription
      adb.c: include ADBDevice parent state in KBDState and MouseState
      cuda.c: include adb_poll_timer in VMStateDescription
      target-ppc: move sdr1 value change detection logic to
helper_store_sdr1()
      target-ppc: force update of msr bits in cpu_post_load
      openpic: fix segfault on -M mac99 savevm
      openpic: fix up loadvm under -M mac99
      openpic: switch IRQQueue queue from inline to bitmap
      openpic: convert to vmstate

Markus Armbruster (3):
      PPC: Clean up misuse of qdev_init() in kvm-openpic creation
      spapr: Clean up misuse of qdev_init() in xics-kvm creation
      spapr_vio: Convert to realize()

Stefan Weil (1):
      target-ppc: Fix warnings from Sparse

Tristan Gingold (1):
      display cpu id dump state

 default-configs/ppc-softmmu.mak    |   1 -
 default-configs/ppc64-softmmu.mak  |   7 -
 default-configs/ppcemb-softmmu.mak |   1 -
 hw/char/spapr_vty.c                |  10 +-
 hw/display/vga-pci.c               |  22 +++
 hw/input/adb.c                     |  22 ++-
 hw/intc/openpic.c                  | 280 ++++++++++++++++----------------
 hw/misc/macio/cuda.c               |   5 +-
 hw/misc/macio/macio.c              |  24 +++
 hw/net/spapr_llan.c                |   6 +-
 hw/nvram/spapr_nvram.c             |  15 +-
 hw/ppc/Makefile.objs               |   2 +-
 hw/ppc/e500.c                      |  20 +--
 hw/ppc/spapr.c                     | 104 +++++++++---
 hw/ppc/spapr_events.c              |   2 +-
 hw/ppc/spapr_hcall.c               |   2 +
 hw/ppc/spapr_iommu.c               |  26 +--
 hw/ppc/spapr_pci.c                 | 321
++++++++++++++++++++++++++++++++++++-
 hw/ppc/spapr_pci_vfio.c            | 115 +++++++++++++
 hw/ppc/spapr_rtas.c                |  49 ------
 hw/ppc/spapr_rtc.c                 | 212 ++++++++++++++++++++++++
 hw/ppc/spapr_vio.c                 |  47 ++++--
 hw/scsi/spapr_vscsi.c              |  13 +-
 hw/timer/mc146818rtc.c             |  44 +----
 hw/vfio/common.c                   |   1 +
 include/hw/pci-host/spapr.h        |  15 +-
 include/hw/ppc/spapr.h             |  52 +++++-
 include/hw/ppc/spapr_vio.h         |   6 +-
 include/migration/vmstate.h        |  15 ++
 include/qom/object.h               |  14 ++
 qom/object.c                       |  79 +++++++++
 target-ppc/cpu-models.c            |  12 +-
 target-ppc/cpu-models.h            |   4 +-
 target-ppc/cpu.h                   |   2 +
 target-ppc/machine.c               |   8 +-
 target-ppc/misc_helper.c           |   7 +-
 target-ppc/mmu-hash64.c            |  42 +++--
 target-ppc/mmu-hash64.h            |   3 +
 target-ppc/mmu_helper.c            |  35 ++--
 target-ppc/translate.c             |   5 +-
 target-ppc/translate_init.c        |  10 ++
 41 files changed, 1277 insertions(+), 383 deletions(-)
 create mode 100644 hw/ppc/spapr_rtc.c

Comments

Peter Maydell March 9, 2015, 1:16 p.m. UTC | #1 
On 9 March 2015 at 21:30, Alexander Graf <agraf@suse.de> wrote:
>
>
> On 09.03.15 04:13, Peter Maydell wrote:
>> On 8 March 2015 at 17:44, Alexander Graf <agraf@suse.de> wrote:
>>> Hi Peter,
>>>
>>> This is my current patch queue for ppc.  Please pull.
>>>
>>> Alex
>>>
>>>
>>> The following changes since commit 3539bbb93e944ffde31c61c369ea9eedcc5697a6:
>>>
>>>   Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150302.0' into staging (2015-03-04 14:37:31 +0000)
>>>
>>> are available in the git repository at:
>>>
>>>
>>>   git://github.com/agraf/qemu.git tags/signed-ppc-for-upstream
>>>
>>> for you to fetch changes up to fa11371474207feeda6ca316e03a9bffd1710276:
>>>
>>>   sPAPR: Implement sPAPRPHBClass EEH callbacks (2015-03-08 09:40:20 +0100)
>>>
>>> ----------------------------------------------------------------
>>> Patch queue for ppc - 2015-03-08
>>>
>>> This is my current patch queue for 2.3. Highlights include:
>>>
>>>   * pseries: 2.3 machine
>>>   * pseries: Export RTC via QOM
>>>   * pseries: EEH support
>>>   * mac: save/restore support
>>>   * fix POWER5 hosts
>>>   * random bug fixes
>>>
>>> ----------------------------------------------------------------

This is giving merge conflicts in hw/display/vga-pci.c now;
they seem more complicated than merely textual, since they're
adding a new object property and the function they're changing
has changed semantics from an initfn to a realizefn. You
probably need to add a new instance init fn to the devices.

-- PMM