Peter,
here is the pull request for the watchdog patches initially
posted at
https://lists.gnu.org/archive/html/qemu-devel/2015-04/msg01950.html
and reposted at
https://lists.gnu.org/archive/html/qemu-devel/2015-06/msg03110.html
I also added and a small fix for the virtio-ccw.img bios from Aurelien.
Christian
The following changes since commit 169b71331eaff7a28e3d4fabe8733e7db91f01aa:
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150611-1' into
staging (2015-06-11 12:12:58 +0100)
are available in the git repository at:
git://github.com/borntraeger/qemu.git tags/s390x-20150615
for you to fetch changes up to 8369e339d24f365750da456588e742674c153437:
s390/bios: build with -fdelete-null-pointer-checks (2015-06-15 13:31:33 +0200)
----------------------------------------------------------------
s390x/kvm/watchdog
1. Implement a diag288 based watchdog
2. Fix virtio-ccw BIOS for gcc >= 4.9
----------------------------------------------------------------
Aurelien Jarno (1):
s390/bios: build with -fdelete-null-pointer-checks
Mao Chuan Li (1):
watchdog: Add new Virtual Watchdog action INJECT-NMI
Xu Wang (5):
watchdog: change option wording to allow for more watchdogs
s390x/watchdog: introduce diag288 watchdog device
s390x/kvm: diag288 instruction interception and handling
s390x/watchdog: diag288 migration support
nmi: Implement inject_nmi() for non-monitor context use
default-configs/s390x-softmmu.mak | 1 +
hw/core/nmi.c | 20 +++++++
hw/watchdog/Makefile.objs | 1 +
hw/watchdog/watchdog.c | 10 ++++
hw/watchdog/wdt_diag288.c | 122 ++++++++++++++++++++++++++++++++++++++
include/hw/nmi.h | 1 +
include/hw/watchdog/wdt_diag288.h | 36 +++++++++++
pc-bios/s390-ccw/Makefile | 2 +-
qapi-schema.json | 6 +-
qemu-options.hx | 26 +++++---
target-s390x/cpu.h | 1 +
target-s390x/kvm.c | 18 ++++++
target-s390x/misc_helper.c | 29 +++++++++
13 files changed, 262 insertions(+), 11 deletions(-)
create mode 100644 hw/watchdog/wdt_diag288.c
create mode 100644 include/hw/watchdog/wdt_diag288.h
