[PULL] qemu-sparc: CG3 framebuffer plus misc sun4m fixes

Hi Peter,

This branch contains updates for SPARC, particularly a new implementation of the CG3 framebuffer as
reviewed on list, plus timer/hostid fixes from Olivier. Please pull.


ATB,

Mark.


The following changes since commit c58e291591dbc1c846fa152d4792554803405ebb:

  Merge remote-tracking branch 'remotes/sstabellini/xen-140220' into staging (2014-02-24 16:12:55 +0000)

are available in the git repository at:


  http://github.com/mcayland/qemu.git qemu-sparc

for you to fetch changes up to c9bf3ff47b8ce424979aa99fafa6b7197d9b6c5f:

  sun4m: Add Sun CG3 framebuffer initialisation function (2014-02-24 20:11:26 +0000)

----------------------------------------------------------------
Mark Cave-Ayland (4):
      sun4m: Set HostID in NVRAM
      sun4m: fix slavio timer RUN/STOP bit
      sun4m: Add Sun CG3 framebuffer and corresponding OpenBIOS FCode ROM
      sun4m: Add Sun CG3 framebuffer initialisation function

 Makefile                                 |    2 +-
 default-configs/sparc-softmmu.mak        |    1 +
 hw/display/Makefile.objs                 |    1 +
 hw/display/cg3.c                         |  384 ++++++++++++++++++++++++++++++
 hw/sparc/sun4m.c                         |   62 ++++-
 hw/timer/slavio_timer.c                  |   25 +-
 include/hw/nvram/openbios_firmware_abi.h |    2 +
 include/sysemu/sysemu.h                  |    1 +
 pc-bios/QEMU,cgthree.bin                 |  Bin 0 -> 850 bytes
 pc-bios/README                           |    4 +-
 vl.c                                     |   24 ++
 11 files changed, 485 insertions(+), 21 deletions(-)
 create mode 100644 hw/display/cg3.c
 create mode 100644 pc-bios/QEMU,cgthree.bin

On 25 February 2014 11:50, Mark Cave-Ayland
<mark.cave-ayland@ilande.co.uk> wrote:
> Hi Peter,
>
> This branch contains updates for SPARC, particularly a new implementation of the CG3 framebuffer as
> reviewed on list, plus timer/hostid fixes from Olivier. Please pull.

Hi. This fails to build on 32 bit, I'm afraid:

/root/qemu/hw/display/cg3.c: In function 'cg3_reg_write':
/root/qemu/hw/display/cg3.c:202:5: error: format '%lx' expects
argument of type 'long unsigned int', but argument 2 has type
'uint64_t' [-Werror=format]

>   http://github.com/mcayland/qemu.git qemu-sparc

PS: if you could be consistent with the URL you use in pull
requests that would be nice; I have you recorded as https://...
(not a big deal, but it means my cut-n-paste "apply this"
doesn't work and I have to tweak it by hand.)

thanks
-- PMM

On 26/02/14 18:45, Peter Maydell wrote:

> On 25 February 2014 11:50, Mark Cave-Ayland
> <mark.cave-ayland@ilande.co.uk>  wrote:
>> Hi Peter,
>>
>> This branch contains updates for SPARC, particularly a new implementation of the CG3 framebuffer as
>> reviewed on list, plus timer/hostid fixes from Olivier. Please pull.
>
> Hi. This fails to build on 32 bit, I'm afraid:
>
> /root/qemu/hw/display/cg3.c: In function 'cg3_reg_write':
> /root/qemu/hw/display/cg3.c:202:5: error: format '%lx' expects
> argument of type 'long unsigned int', but argument 2 has type
> 'uint64_t' [-Werror=format]

Ah I see. Looks like I accidentally used a direct format identifier 
rather than one of the standard format macros which is what caused the 
breakage on a different architecture.

I've just updated my qemu-sparc branch with an updated version which 
uses HWADDR_PRIx for displaying addresses and PRIx64 for displaying the 
64-bit value field for those 2 lines in question which should resolve it.

>>    http://github.com/mcayland/qemu.git qemu-sparc
>
> PS: if you could be consistent with the URL you use in pull
> requests that would be nice; I have you recorded as https://...
> (not a big deal, but it means my cut-n-paste "apply this"
> doesn't work and I have to tweak it by hand.)

Yes, my fault entirely. I sent pull request remotely in order to submit 
it before freeze and obviously made a typo. I'll resubmit a PULLv2 
shortly which will have the correct URL.


Many thanks,

Mark.