Re: [Qemu-ppc] [PATCHv3 00/12] macio: remove legacy macio_init() function

[David Gibson]

On Wed, Feb 28, 2018 at 08:32:31PM +0000, Mark Cave-Ayland wrote:
> This patchset eliminates the legacy macio_init() function used to setup the
> ESCC and PIC memory regions and instead allows the macio device to be
> instantiated directly via qdev, wiring up the ESCC internally using sysbus 
> MMIO
> memory regions and the PIC via QOM object links.
> 
> The biggest surprise in this patchset was the need to QOMify the heathrow
> device which apparently up until now has never required any of these 
> new-fangled
> APIs from the last decade such as qdev and QOM.
> 
> There's still some follow-up work to do with the PCI host bridge wiring but it
> seems to me that this is a good preparation step.
> 
> Signed-off-by: Mark Cave-Ayland <address@hidden>

Applied to ppc-for-2.12, thanks.

> 
> v3:
> - Rebase onto master
> - Add extra R-B tags from David and Philippe
> - Add patch 8 to move KVM openpic declarations into separate openpic_kvm.h 
> file
>   (fixes compilation of ppc-linux-user)
> 
> v2:
> - Rebase onto master
> - Add R-B tags from David
> - Rework patch 4 ("heathrow: convert to trace-events") as suggested by David
> 
> 
> Mark Cave-Ayland (12):
>   macio: embed DBDMA device directly within macio
>   macio: move ESCC device within the macio device
>   heathrow: QOMify heathrow PIC
>   heathrow: convert to trace-events
>   heathrow: change heathrow_pic_init() to return the heathrow device
>   macio: move macio related structures and defines into separate macio.h
>     file
>   mac_oldworld: use object link to pass heathrow PIC object to macio
>   openpic: move KVM-specific declarations into separate openpic_kvm.h
>     file
>   openpic: move OpenPIC state and related definitions to openpic.h
>   mac_newworld: use object link to pass OpenPIC object to macio
>   macio: move setting of CUDA timebase frequency to
>     macio_common_realize()
>   macio: remove macio_init() function
> 
>  hw/intc/heathrow_pic.c         | 166 
> +++++++++++++++++++++--------------------
>  hw/intc/openpic.c              | 157 --------------------------------------
>  hw/intc/openpic_kvm.c          |   1 +
>  hw/intc/trace-events           |   5 ++
>  hw/misc/macio/macio.c          | 150 +++++++++++++++++--------------------
>  hw/ppc/e500.c                  |   1 +
>  hw/ppc/mac.h                   |  10 +--
>  hw/ppc/mac_newworld.c          |  56 +++++---------
>  hw/ppc/mac_oldworld.c          |  50 +++++--------
>  include/hw/intc/heathrow_pic.h |  49 ++++++++++++
>  include/hw/misc/macio/macio.h  |  79 ++++++++++++++++++++
>  include/hw/ppc/openpic.h       | 160 ++++++++++++++++++++++++++++++++++++++-
>  include/hw/ppc/openpic_kvm.h   |   7 ++
>  target/ppc/kvm-stub.c          |   2 +-
>  14 files changed, 494 insertions(+), 399 deletions(-)
>  create mode 100644 include/hw/intc/heathrow_pic.h
>  create mode 100644 include/hw/misc/macio/macio.h
>  create mode 100644 include/hw/ppc/openpic_kvm.h
> 

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature