Change since v1:
  * Incorporate Phil's -vga none fix for boot-serial-test (patch 7).


r~


The following changes since commit 6918ab2570bcf942651e69f7ad975e137679738b:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200123-4' into staging (2020-01-23 16:36:55 +0000)

are available in the Git repository at:

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

for you to fetch changes up to b670f6d717a6a1795358c07823b4e968c0b61a86:

  target/hppa: Allow, but diagnose, LDCW aligned only mod 4 (2020-01-23 10:55:20 -1000)

----------------------------------------------------------------
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            | 1450 ++++++++++++++++++++++++++++++++++++++++
 hw/hppa/dino.c                 |   97 ++-
 hw/hppa/lasi.c                 |  368 ++++++++++
 hw/hppa/machine.c              |   33 +-
 hw/input/lasips2.c             |  289 ++++++++
 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, 3345 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

On Thu, 23 Jan 2020 at 22:10, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> Change since v1:
>   * Incorporate Phil's -vga none fix for boot-serial-test (patch 7).
>
>
> r~
>
>
> The following changes since commit 6918ab2570bcf942651e69f7ad975e137679738b:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200123-4' into staging (2020-01-23 16:36:55 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/rth7680/qemu.git tags/pull-pa-20200123
>
> for you to fetch changes up to b670f6d717a6a1795358c07823b4e968c0b61a86:
>
>   target/hppa: Allow, but diagnose, LDCW aligned only mod 4 (2020-01-23 10:55:20 -1000)
>
> ----------------------------------------------------------------
> Improve LASI emulation
> Add Artist graphics
> Fix main memory allocation
> Improve LDCW emulation wrt real hw
>

Hi; I'm afraid this has format-string errors for 32-bit and clang:

OSX:

/Users/pm215/src/qemu-for-merges/hw/display/artist.c:1035:41: error:
format specifies type 'unsigned long' but the argument has type
'hwaddr' (aka 'unsigned long long') [-Werror,-Wformat]
                " size=%d\n", __func__, addr, val, size);
                                        ^~~~
/Users/pm215/src/qemu-for-merges/include/qemu/log.h:118:30: note:
expanded from macro 'qemu_log_mask'
            qemu_log(FMT, ## __VA_ARGS__);              \
                             ^~~~~~~~~~~
/Users/pm215/src/qemu-for-merges/hw/display/artist.c:1035:47: error:
format specifies type 'unsigned long' but the argument has type
'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat]
                " size=%d\n", __func__, addr, val, size);
                                              ^~~
/Users/pm215/src/qemu-for-merges/include/qemu/log.h:118:30: note:
expanded from macro 'qemu_log_mask'
            qemu_log(FMT, ## __VA_ARGS__);              \
                             ^~~~~~~~~~~
/Users/pm215/src/qemu-for-merges/hw/display/artist.c:1121:69: error:
format specifies type 'unsigned long' but the argument has type
'hwaddr' (aka 'unsigned long long') [-Werror,-Wformat]
        qemu_log("%s: unknown register: %08lx size %d\n", __func__, addr, size);
                                        ~~~~~                       ^~~~
                                        %08llx
3 errors generated.


aarch32 has those 3 and also:

/home/peter.maydell/qemu/hw/net/i82596.c: In function 'i82596_receive':
/home/peter.maydell/qemu/hw/net/i82596.c:531:45: error: format '%lu'
expects argument of type 'long unsigned int', but argument 2 has type
'size_t {aka unsigned int}' [-Werror=format=]
         printf("Received frame too small, %lu vs. %u bytes\n",
                                           ~~^
                                           %u


OpenBSD has another 2:

/home/qemu/qemu-test.HtS7yu/src/hw/input/lasips2.c:178:62: warning:
format specifies type 'unsigned long' but the argument has type
'hwaddr' (aka 'unsigned long long') [-Wformat]
        qemu_log("%s: unknown register 0x%02lx\n", __func__, addr);
                                         ~~~~~               ^~~~
                                         %02llx
/home/qemu/qemu-test.HtS7yu/src/hw/input/lasips2.c:239:62: warning:
format specifies type 'unsigned long' but the argument has type
'hwaddr' (aka 'unsigned long long') [-Wformat]
        qemu_log("%s: unknown register 0x%02lx\n", __func__, addr);
                                         ~~~~~               ^~~~
                                         %02llx

thanks
-- PMM