Re: [Qemu-devel] qemu Makefile.target vl.h hw/cuda.c hw/grackle_...

[Blue Swirl]

On 11/1/07, Blue Swirl <address@hidden> wrote:
> On 10/29/07, Jocelyn Mayer <address@hidden> wrote:
> > CVSROOT:        /sources/qemu
> > Module name:    qemu
> > Changes by:     Jocelyn Mayer <j_mayer> 07/10/28 23:42:18
> >
> > Modified files:
> >         .              : Makefile.target vl.h
> >         hw             : cuda.c grackle_pci.c heathrow_pic.c ppc.c
> >                          ppc_chrp.c ppc_prep.c
> > Added files:
> >         hw             : mac_dbdma.c mac_nvram.c macio.c ppc_mac.h
> >                          ppc_oldworld.c
> >
> > Log message:
> >         * sort the PowerPC target object files
> >         * make PowerPC NVRAM accessors generic to be able to use a MacIO 
> > NVRAM
> >           instead of the M48T59 one
> >         * split PowerMac targets code:
> >          - move all PowerMac related definitions and prototypes into 
> > hw/ppc_mac.h
> >          - add hw/mac_dbdma.c, hw/mac_nvram.c and macio.c
> >            which implements shared PowerMac devices
> >          - define the g3bw machine in a new hw/ppc_oldworld.c file
> >         * Fix the g3bw target:
> >          - fix the Grackle host PCI device
> >          - connect the Heathrow PIC to the PowerPC 6xx bus pins
> >
> > CVSWeb URLs:
> > http://cvs.savannah.gnu.org/viewcvs/qemu/Makefile.target?cvsroot=qemu&r1=1.212&r2=1.213
> > http://cvs.savannah.gnu.org/viewcvs/qemu/vl.h?cvsroot=qemu&r1=1.280&r2=1.281
> > http://cvs.savannah.gnu.org/viewcvs/qemu/hw/cuda.c?cvsroot=qemu&r1=1.16&r2=1.17
> > http://cvs.savannah.gnu.org/viewcvs/qemu/hw/grackle_pci.c?cvsroot=qemu&r1=1.6&r2=1.7
> > http://cvs.savannah.gnu.org/viewcvs/qemu/hw/heathrow_pic.c?cvsroot=qemu&r1=1.5&r2=1.6
> > http://cvs.savannah.gnu.org/viewcvs/qemu/hw/ppc.c?cvsroot=qemu&r1=1.34&r2=1.35
> > http://cvs.savannah.gnu.org/viewcvs/qemu/hw/ppc_chrp.c?cvsroot=qemu&r1=1.44&r2=1.45
> > http://cvs.savannah.gnu.org/viewcvs/qemu/hw/ppc_prep.c?cvsroot=qemu&r1=1.47&r2=1.48
> > http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mac_dbdma.c?cvsroot=qemu&rev=1.1
> > http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mac_nvram.c?cvsroot=qemu&rev=1.1
> > http://cvs.savannah.gnu.org/viewcvs/qemu/hw/macio.c?cvsroot=qemu&rev=1.1
> > http://cvs.savannah.gnu.org/viewcvs/qemu/hw/ppc_mac.h?cvsroot=qemu&rev=1.1
> > http://cvs.savannah.gnu.org/viewcvs/qemu/hw/ppc_oldworld.c?cvsroot=qemu&rev=1.1
>
> You broke sparc64-softmmu build with this patch.

I think the best solution to fix this is to put the nvram helpers to
m48t59.h as inline functions  instead of duplicating the code in
several places.