Version 4 fixes trivial conflicts with
commit 4f67d30b5e74e060b8dbe10528829b47345cd6e8
Author: Marc-André Lureau <marcandre.lur...@redhat.com>
Date: Fri Jan 10 19:30:32 2020 +0400
qdev: set properties with device_class_set_props()
r~
The following changes since commit 105b07f1ba462ec48b27e5cb74ddf81c6a79364c:
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200127' into
staging (2020-01-27 13:02:36 +0000)
are available in the Git repository at:
https://github.com/rth7680/qemu.git tags/pull-pa-20200127
for you to fetch changes up to b1af755c33bf0d690553a5ccd93689dfd15a98e8:
target/hppa: Allow, but diagnose, LDCW aligned only mod 4 (2020-01-27
10:49:51 -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
