mbox

[PULL,v3,00/11] target/hppa patch queue

Message ID 20200124232009.12928-1-richard.henderson@linaro.org
State New
Headers show

Pull-request

https://github.com/rth7680/qemu.git tags/pull-pa-20200124

Message

Richard Henderson Jan. 24, 2020, 11:19 p.m. UTC 
Version 3 fixes printf formatting errors, and some indentation
errors, in artist.c, lasips2.c, and i82596.c.


r~


The following changes since commit ba2ed84fe6a78f64b2da441750fc6e925d94106a:

  Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-5.0-sf1' into staging (2020-01-24 12:34:04 +0000)

are available in the Git repository at:

  https://github.com/rth7680/qemu.git tags/pull-pa-20200124

for you to fetch changes up to 5b33eecce852658121b1190fee466f01a69e1910:

  target/hppa: Allow, but diagnose, LDCW aligned only mod 4 (2020-01-24 14:35:58 -0800)

----------------------------------------------------------------
Improve LASI emulation
Add Artist graphics
Fix main memory allocation
Improve LDCW emulation wrt real hw

----------------------------------------------------------------
Helge Deller (3):
      hw/hppa/dino.c: Improve emulation of Dino PCI chip
      hppa: Add support for LASI chip with i82596 NIC
      hppa: Switch to tulip NIC by default

Philippe Mathieu-Daudé (3):
      hw/hppa/machine: Correctly check the firmware is in PDC range
      hw/hppa/machine: Restrict the total memory size to 3GB
      hw/hppa/machine: Map the PDC memory region with higher priority

Richard Henderson (1):
      target/hppa: Allow, but diagnose, LDCW aligned only mod 4

Sven Schnelle (4):
      ps2: accept 'Set Key Make and Break' commands
      hppa: add emulation of LASI PS2 controllers
      seabios-hppa: update to latest version
      hppa: Add emulation of Artist graphics

 hw/hppa/hppa_hardware.h        |    1 +
 hw/hppa/hppa_sys.h             |    2 +
 hw/net/i82596.h                |   55 ++
 include/hw/input/lasips2.h     |   16 +
 include/hw/input/ps2.h         |    1 +
 include/hw/net/lasi_82596.h    |   29 +
 target/hppa/helper.h           |    2 +
 hw/display/artist.c            | 1454 ++++++++++++++++++++++++++++++++++++++++
 hw/hppa/dino.c                 |   97 ++-
 hw/hppa/lasi.c                 |  368 ++++++++++
 hw/hppa/machine.c              |   33 +-
 hw/input/lasips2.c             |  291 ++++++++
 hw/input/ps2.c                 |   15 +
 hw/net/i82596.c                |  734 ++++++++++++++++++++
 hw/net/lasi_i82596.c           |  188 ++++++
 target/hppa/op_helper.c        |    9 +
 target/hppa/translate.c        |   15 +-
 tests/qtest/boot-serial-test.c |    3 +-
 MAINTAINERS                    |    4 +-
 hw/display/Kconfig             |    4 +
 hw/display/Makefile.objs       |    1 +
 hw/display/trace-events        |    9 +
 hw/hppa/Kconfig                |    3 +
 hw/hppa/Makefile.objs          |    2 +-
 hw/hppa/trace-events           |   10 +
 hw/input/Kconfig               |    3 +
 hw/input/Makefile.objs         |    1 +
 hw/input/trace-events          |    5 +
 hw/net/Kconfig                 |    7 +
 hw/net/Makefile.objs           |    2 +
 hw/net/trace-events            |   13 +
 pc-bios/hppa-firmware.img      |  Bin 783724 -> 766136 bytes
 roms/seabios-hppa              |    2 +-
 33 files changed, 3351 insertions(+), 28 deletions(-)
 create mode 100644 hw/net/i82596.h
 create mode 100644 include/hw/input/lasips2.h
 create mode 100644 include/hw/net/lasi_82596.h
 create mode 100644 hw/display/artist.c
 create mode 100644 hw/hppa/lasi.c
 create mode 100644 hw/input/lasips2.c
 create mode 100644 hw/net/i82596.c
 create mode 100644 hw/net/lasi_i82596.c

Comments

Peter Maydell Jan. 27, 2020, 11:23 a.m. UTC | #1 
On Fri, 24 Jan 2020 at 23:20, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> Version 3 fixes printf formatting errors, and some indentation
> errors, in artist.c, lasips2.c, and i82596.c.
>
>
> r~
>
>
> The following changes since commit ba2ed84fe6a78f64b2da441750fc6e925d94106a:
>
>   Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-5.0-sf1' into staging (2020-01-24 12:34:04 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/rth7680/qemu.git tags/pull-pa-20200124
>
> for you to fetch changes up to 5b33eecce852658121b1190fee466f01a69e1910:
>
>   target/hppa: Allow, but diagnose, LDCW aligned only mod 4 (2020-01-24 14:35:58 -0800)
>
> ----------------------------------------------------------------
> Improve LASI emulation
> Add Artist graphics
> Fix main memory allocation
> Improve LDCW emulation wrt real hw

This fails to compile -- I suspect your pullreq needs updating
to account for something in Paolo's most recent applied pull:

/home/petmay01/qemu-for-merges/hw/net/lasi_i82596.c: In function
'lasi_82596_class_init':
/home/petmay01/qemu-for-merges/hw/net/lasi_i82596.c:171:7: error:
'DeviceClass {aka struct DeviceClass}' has no member named 'props'
     dc->props = lasi_82596_properties;
       ^

(and similar in hw/display/artist.c)

Looks like these should now be
     device_class_set_props(dc, lasi_82596_properties);

thanks
-- PMM