Re: [Qemu-devel] [PULL 2.3 00/38] ppc patch queue 2015-03-08

[Peter Maydell]

On 9 March 2015 at 21:30, Alexander Graf <address@hidden> wrote:
>
>
> On 09.03.15 04:13, Peter Maydell wrote:
>> On 8 March 2015 at 17:44, Alexander Graf <address@hidden> 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